This repository has been archived by the owner on Nov 1, 2020. It is now read-only.
Wasm: add support for new StackTrace().ToString() #8201
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -15,4 +15,8 @@ | |||
| </PropertyGroup> | |||
|
|
|||
| <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), SimpleTest.targets))\SimpleTest.targets" /> | |||
|
|
|||
| <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> | |||
| <DefineConstants>DEBUG</DefineConstants> | |||
There was a problem hiding this comment.
This will remove all the other defined constants. I find it odd that DEBUG wouldn't be defined. Can you run msbuild with /v:diag to see if something is removing it?
There was a problem hiding this comment.
Removed. I must have been getting confused somewhere. Thanks for reviewing
# Conflicts: # tests/src/Simple/HelloWasm/Program.cs
jkotas
reviewed
Aug 25, 2020
src/System.Private.CoreLib/src/System/Diagnostics/StackTrace.CoreRT.Wasm.cs
Outdated
Show resolved
Hide resolved
jkotas
reviewed
Aug 25, 2020
| @@ -53,7 +53,7 @@ private unsafe void InitializeForCurrentThread(int skipFrames, bool needFileInfo | |||
| internal string ToString(TraceFormat traceFormat) | |||
| { | |||
| if (traceFormat == TraceFormat.Normal && _builder.ToString().EndsWith(Environment.NewLine)) | |||
There was a problem hiding this comment.
I would be nice to call ToString just once.
There was a problem hiding this comment.
Right, no problem. If its ok I'll wait until I get the emscripten 2.0.0 #8281 in, as its a bit of pain resetting emscripten versions as its at 400+MB download each time.
jkotas
approved these changes
Aug 26, 2020
RalfKornmannEnvision
added a commit
to RalfKornmannEnvision/corert
that referenced
this pull request
Aug 28, 2020
* Fix alignment of marshaled inline arrays (dotnet#8275) Fixes dotnet#8274 * Correct flags for allocating in RhpNewFastMisalign. Add fast path (dotnet#8277) * add switch case for LPUTF8Str in array element (dotnet#8278) * Wasm: Add support for DefaultConstructorOf and hence Activator.CreateInstance<T> (dotnet#8279) * Wasm: upgrade emscripten for an llvm and exception fixes. (dotnet#8281) * upgrade emscripten for some llvm and exception fixes. Correct retrieval of exception from landing pad. end c++ exception when catch found. * Update ILToWebAssemblyImporter.cs remove cut/past comment * Wasm: add support for new StackTrace().ToString() (dotnet#8201) * wasm add rethrow support (dotnet#8206) * Wasm: add support for overflow checks on signed and unsigned ints multiply (dotnet#8259) * wasm-ovf-unsigned-int * refactor for stack kind tests and add signed check * use llvm intrinsics * Wasm: bring add and sub overflow operations in line with mul (dotnet#8284) * Support for ARM64 on UNIX like systems compiler and runtime (dotnet#8271) * CoreRT-ARM64: Helper node asm code generation * CoreRT ARM64: Add additional relocation support * CoreRT ARM64: Use alternative functions for write Barriers On ARM the Jit uses a special register interface for to call the write barrier functions. But as the regular once still used in other places we need two different implementations. The helper nodes need to call the custom variants * ARM64 code generation * unwind use only the dwarf index option * ARM64 runtime assembler functions * ARM64 unix stack walk * ARM64 Exception Handling * ARM64: Fix EH data decoding * Move native layout signature from read only to data section on non Windows target * Fix exception handling macro call * ARM64 thunk helpers * ARM64 process cfi data for elf * ARM64 missing assembler macro * ARM64 port more assembler helpers * ARM64: Add missing case for the generic helper node * ARM64 intrinsic support * ARM64 object writer for ELF object files * ARM64 llvm patches for object writer * ARM64 include untested helper code with debug break * ARM64 reenable scanning fail exception * ARM64 Fix wrong function call for invoke return * ARM64: Ensure module fixup node data is aligned Data is updated with a compare exchange operation. Therefore it needs to be aligned or it will trigger a data exception on ARM64 CPUs * Wasm fix LLVM Debug Information subroutine linkage (dotnet#8288) * wasm - reinstate llvm debug subroutine linkage Co-authored-by: Jan Kotas <[email protected]> Co-authored-by: yowl <[email protected]>
RalfKornmannEnvision
added a commit
to RalfKornmannEnvision/corert
that referenced
this pull request
Aug 28, 2020
* Arm64 (#5) * CoreRT-ARM64: Helper node asm code generation * CoreRT ARM64: Add additional relocation support * CoreRT ARM64: Use alternative functions for write Barriers On ARM the Jit uses a special register interface for to call the write barrier functions. But as the regular once still used in other places we need two different implemenations. The helper nodes need to call the custom variants * ARM64 code generation * unwind use only the dwarf index option * ARM64 runtime assembler functions * ARM64 unix stack walk * ARM64 Exception Handling * ARM64: Fix EH data decodeing * Move nattive layout signature from read only to data section on non Windows target * Fix exception handling macro call * ARM64 thunk helpers * ARM64 process cfi data for elf * ARM64 missing assembler macro * ARM64 port more assembler helpers * ARM64: Add missing case for the gemeric helper node * ARM64 intrinsic support * ARM64 object writer for ELF object files * ARM64 llvm patches for object writer * ARM64 include untested helper code with debug break * ARM64 reenable scanning fail exception * Arm64 (#6) * CoreRT-ARM64: Helper node asm code generation * CoreRT ARM64: Add additional relocation support * CoreRT ARM64: Use alternative functions for write Barriers On ARM the Jit uses a special register interface for to call the write barrier functions. But as the regular once still used in other places we need two different implemenations. The helper nodes need to call the custom variants * ARM64 code generation * unwind use only the dwarf index option * ARM64 runtime assembler functions * ARM64 unix stack walk * ARM64 Exception Handling * ARM64: Fix EH data decodeing * Move nattive layout signature from read only to data section on non Windows target * Fix exception handling macro call * ARM64 thunk helpers * ARM64 process cfi data for elf * ARM64 missing assembler macro * ARM64 port more assembler helpers * ARM64: Add missing case for the gemeric helper node * ARM64 intrinsic support * ARM64 object writer for ELF object files * ARM64 llvm patches for object writer * ARM64 include untested helper code with debug break * ARM64 reenable scanning fail exception * ARM64 formating * ARM64: revert using alternative JIT * Revert "ARM64 unix stack walk" This reverts commit 6c9e235. * Arm64 (#7) * CoreRT-ARM64: Helper node asm code generation * CoreRT ARM64: Add additional relocation support * CoreRT ARM64: Use alternative functions for write Barriers On ARM the Jit uses a special register interface for to call the write barrier functions. But as the regular once still used in other places we need two different implemenations. The helper nodes need to call the custom variants * ARM64 code generation * unwind use only the dwarf index option * ARM64 runtime assembler functions * ARM64 unix stack walk * ARM64 Exception Handling * ARM64: Fix EH data decodeing * Move nattive layout signature from read only to data section on non Windows target * Fix exception handling macro call * ARM64 thunk helpers * ARM64 process cfi data for elf * ARM64 missing assembler macro * ARM64 port more assembler helpers * ARM64: Add missing case for the gemeric helper node * ARM64 intrinsic support * ARM64 object writer for ELF object files * ARM64 llvm patches for object writer * ARM64 include untested helper code with debug break * ARM64 reenable scanning fail exception * ARM64 formating * ARM64: revert using alternative JIT * Revert "ARM64 unix stack walk" * ARM64 review reworks * Arm64: review reworks (#10) * Arm64 (#11) * ARM64: remove left over code * Update src/Native/Runtime/arm64/WriteBarriers.S * Sync to head (#12) * Fix alignment of marshaled inline arrays (dotnet#8275) Fixes dotnet#8274 * Correct flags for allocating in RhpNewFastMisalign. Add fast path (dotnet#8277) * add switch case for LPUTF8Str in array element (dotnet#8278) * Wasm: Add support for DefaultConstructorOf and hence Activator.CreateInstance<T> (dotnet#8279) * Wasm: upgrade emscripten for an llvm and exception fixes. (dotnet#8281) * upgrade emscripten for some llvm and exception fixes. Correct retrieval of exception from landing pad. end c++ exception when catch found. * Update ILToWebAssemblyImporter.cs remove cut/past comment * Wasm: add support for new StackTrace().ToString() (dotnet#8201) * wasm add rethrow support (dotnet#8206) * Wasm: add support for overflow checks on signed and unsigned ints multiply (dotnet#8259) * wasm-ovf-unsigned-int * refactor for stack kind tests and add signed check * use llvm intrinsics * Wasm: bring add and sub overflow operations in line with mul (dotnet#8284) * Support for ARM64 on UNIX like systems compiler and runtime (dotnet#8271) * CoreRT-ARM64: Helper node asm code generation * CoreRT ARM64: Add additional relocation support * CoreRT ARM64: Use alternative functions for write Barriers On ARM the Jit uses a special register interface for to call the write barrier functions. But as the regular once still used in other places we need two different implementations. The helper nodes need to call the custom variants * ARM64 code generation * unwind use only the dwarf index option * ARM64 runtime assembler functions * ARM64 unix stack walk * ARM64 Exception Handling * ARM64: Fix EH data decoding * Move native layout signature from read only to data section on non Windows target * Fix exception handling macro call * ARM64 thunk helpers * ARM64 process cfi data for elf * ARM64 missing assembler macro * ARM64 port more assembler helpers * ARM64: Add missing case for the generic helper node * ARM64 intrinsic support * ARM64 object writer for ELF object files * ARM64 llvm patches for object writer * ARM64 include untested helper code with debug break * ARM64 reenable scanning fail exception * ARM64 Fix wrong function call for invoke return * ARM64: Ensure module fixup node data is aligned Data is updated with a compare exchange operation. Therefore it needs to be aligned or it will trigger a data exception on ARM64 CPUs * Wasm fix LLVM Debug Information subroutine linkage (dotnet#8288) * wasm - reinstate llvm debug subroutine linkage Co-authored-by: Jan Kotas <[email protected]> Co-authored-by: yowl <[email protected]> Co-authored-by: Jan Kotas <[email protected]> Co-authored-by: yowl <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds initial support for
StackTraceand it'sToStringvia emscripten'semscripten_get_callstackfunction. This should help in getting aStackTraceforExceptionand enabling the Exceptions simple test.