diff options
| author | Carol Eidt <carol.eidt@microsoft.com> | 2018-08-21 01:44:07 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2018-08-21 01:44:07 -0700 |
| commit | 4d9c822c062b3a97ab16ef0f9c7a33be79819fe9 (patch) | |
| tree | a482ea67be94ced961d5bb6f3549c093a2fb45e3 /src/vm | |
| parent | 41f78344b91bbd40cce288269292f3f7301b60a7 (diff) | |
| download | coreclr-4d9c822c062b3a97ab16ef0f9c7a33be79819fe9.tar.gz coreclr-4d9c822c062b3a97ab16ef0f9c7a33be79819fe9.tar.bz2 coreclr-4d9c822c062b3a97ab16ef0f9c7a33be79819fe9.zip | |
Handle null byref in helper (#19571)
Add JIT_ByRefWriteBarrier to IsIPInMarkedJitHelper so that a null dereference will be handled.
Fix #19444
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/amd64/JitHelpers_Fast.asm | 2 | ||||
| -rw-r--r-- | src/vm/amd64/jithelpers_fast.S | 2 | ||||
| -rw-r--r-- | src/vm/excep.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/vm/amd64/JitHelpers_Fast.asm b/src/vm/amd64/JitHelpers_Fast.asm index 6b94c66782..83f7132688 100644 --- a/src/vm/amd64/JitHelpers_Fast.asm +++ b/src/vm/amd64/JitHelpers_Fast.asm @@ -722,7 +722,7 @@ endif add rdi, 8h add rsi, 8h ret -LEAF_END JIT_ByRefWriteBarrier, _TEXT +LEAF_END_MARKED JIT_ByRefWriteBarrier, _TEXT g_pObjectClass equ ?g_pObjectClass@@3PEAVMethodTable@@EA diff --git a/src/vm/amd64/jithelpers_fast.S b/src/vm/amd64/jithelpers_fast.S index 63b54297a6..37f41421b1 100644 --- a/src/vm/amd64/jithelpers_fast.S +++ b/src/vm/amd64/jithelpers_fast.S @@ -384,7 +384,7 @@ LEAF_ENTRY JIT_ByRefWriteBarrier, _TEXT add rdi, 8h add rsi, 8h ret -LEAF_END JIT_ByRefWriteBarrier, _TEXT +LEAF_END_MARKED JIT_ByRefWriteBarrier, _TEXT // TODO: put definition for this in asmconstants.h #define CanCast 1 diff --git a/src/vm/excep.cpp b/src/vm/excep.cpp index 5cd5e6c2e2..da07c5ad99 100644 --- a/src/vm/excep.cpp +++ b/src/vm/excep.cpp @@ -6951,6 +6951,7 @@ EXTERN_C void JIT_MemCpy_End(); EXTERN_C void JIT_WriteBarrier_End(); EXTERN_C void JIT_CheckedWriteBarrier_End(); +EXTERN_C void JIT_ByRefWriteBarrier_End(); #endif // _TARGET_X86_ #if defined(_TARGET_AMD64_) && defined(_DEBUG) @@ -6977,6 +6978,7 @@ bool IsIPInMarkedJitHelper(UINT_PTR uControlPc) CHECK_RANGE(JIT_WriteBarrier) CHECK_RANGE(JIT_CheckedWriteBarrier) + CHECK_RANGE(JIT_ByRefWriteBarrier) #else #ifdef FEATURE_PAL CHECK_RANGE(JIT_WriteBarrierGroup) |