diff options
| author | Andrew Au <cshung@gmail.com> | 2019-01-11 08:34:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 08:34:21 -0800 |
| commit | bbd812d77d6d0b79e6f00025de906b4e1ac93c7e (patch) | |
| tree | fef6344f36ffd8b4404c8826bb4e8ef5dd971ac6 /src/vm/jitinterface.cpp | |
| parent | dabe2b8f49479fc3c2958c97e6b1472c2d40af0f (diff) | |
| download | coreclr-bbd812d77d6d0b79e6f00025de906b4e1ac93c7e.tar.gz coreclr-bbd812d77d6d0b79e6f00025de906b4e1ac93c7e.tar.bz2 coreclr-bbd812d77d6d0b79e6f00025de906b4e1ac93c7e.zip | |
Flowing the nativeCodeVersion to DebuggerJitInfo (#21925)
Diffstat (limited to 'src/vm/jitinterface.cpp')
| -rw-r--r-- | src/vm/jitinterface.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/vm/jitinterface.cpp b/src/vm/jitinterface.cpp index c7d55b519c..37046efd7a 100644 --- a/src/vm/jitinterface.cpp +++ b/src/vm/jitinterface.cpp @@ -12463,12 +12463,14 @@ CorJitResult CallCompileMethodWithSEHWrapper(EEJitManager *jitMgr, CORJIT_FLAGS flags, BYTE **nativeEntry, ULONG *nativeSizeOfCode, - MethodDesc *ftn) + NativeCodeVersion nativeCodeVersion) { // no dynamic contract here because SEH is used, with a finally clause STATIC_CONTRACT_NOTHROW; STATIC_CONTRACT_GC_TRIGGERS; + MethodDesc* ftn = nativeCodeVersion.GetMethodDesc(); + LOG((LF_CORDB, LL_EVERYTHING, "CallCompileMethodWithSEHWrapper called...\n")); struct Param @@ -12521,7 +12523,7 @@ CorJitResult CallCompileMethodWithSEHWrapper(EEJitManager *jitMgr, { if (param.res == CORJIT_OK && !((CEEJitInfo*)param.comp)->JitAgain()) { - g_pDebugInterface->JITComplete(ftn, (TADDR)*nativeEntry); + g_pDebugInterface->JITComplete(nativeCodeVersion, (TADDR)*nativeEntry); } } } @@ -12760,11 +12762,13 @@ BOOL g_fAllowRel32 = TRUE; // Calls to this method that occur to check if inlining can occur on x86, // are OK since they discard the return value of this method. -PCODE UnsafeJitFunction(MethodDesc* ftn, COR_ILMETHOD_DECODER* ILHeader, CORJIT_FLAGS flags, +PCODE UnsafeJitFunction(NativeCodeVersion nativeCodeVersion, COR_ILMETHOD_DECODER* ILHeader, CORJIT_FLAGS flags, ULONG * pSizeOfCode) { STANDARD_VM_CONTRACT; + MethodDesc* ftn = nativeCodeVersion.GetMethodDesc(); + PCODE ret = NULL; COOPERATIVE_TRANSITION_BEGIN(); @@ -13000,7 +13004,7 @@ PCODE UnsafeJitFunction(MethodDesc* ftn, COR_ILMETHOD_DECODER* ILHeader, CORJIT_ flags, &nativeEntry, &sizeOfCode, - (MethodDesc*)ftn); + nativeCodeVersion); LOG((LF_CORDB, LL_EVERYTHING, "Got through CallCompile MethodWithSEHWrapper\n")); #if FEATURE_PERFMAP |