diff options
| author | John Salem <josalem@microsoft.com> | 2019-02-25 14:53:16 -0800 |
|---|---|---|
| committer | John Salem <josalem@microsoft.com> | 2019-02-25 14:53:16 -0800 |
| commit | 3d26dad131abc354aeb4388139ecfaafe6cc4c60 (patch) | |
| tree | b8c75d4778294c121ec33ca0b4633f7d68f6b817 | |
| parent | 8d1908e7ff4fbf01dc6c84e174dee79ff0cdf826 (diff) | |
| download | coreclr-3d26dad131abc354aeb4388139ecfaafe6cc4c60.tar.gz coreclr-3d26dad131abc354aeb4388139ecfaafe6cc4c60.tar.bz2 coreclr-3d26dad131abc354aeb4388139ecfaafe6cc4c60.zip | |
Simplify getting exposed Assembly, and specifies parameter types for GetSourceLineInfo
| -rw-r--r-- | src/System.Private.CoreLib/src/System/Diagnostics/StackFrameHelper.cs | 8 | ||||
| -rw-r--r-- | src/vm/debugdebugger.cpp | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/System.Private.CoreLib/src/System/Diagnostics/StackFrameHelper.cs b/src/System.Private.CoreLib/src/System/Diagnostics/StackFrameHelper.cs index 8b6d73ee80..8885db9252 100644 --- a/src/System.Private.CoreLib/src/System/Diagnostics/StackFrameHelper.cs +++ b/src/System.Private.CoreLib/src/System/Diagnostics/StackFrameHelper.cs @@ -117,7 +117,13 @@ namespace System.Diagnostics return; } - MethodInfo symbolsMethodInfo = symbolsType.GetMethod("GetSourceLineInfo", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance); + Type[] parameterTypes = new Type[] + { + typeof(string), typeof(IntPtr), typeof(int), typeof(IntPtr), + typeof(int), typeof(int), typeof(int), + typeof(string).MakeByRefType(), typeof(int).MakeByRefType(), typeof(int).MakeByRefType() + }; + MethodInfo symbolsMethodInfo = symbolsType.GetMethod("GetSourceLineInfo", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, parameterTypes, null); if (symbolsMethodInfo == null) { return; diff --git a/src/vm/debugdebugger.cpp b/src/vm/debugdebugger.cpp index ca6cfb0078..d63433f4f4 100644 --- a/src/vm/debugdebugger.cpp +++ b/src/vm/debugdebugger.cpp @@ -518,7 +518,7 @@ FCIMPL4(void, DebugStackTrace::GetStackFramesInternal, pILI4[iNumValidFrames] = data.pElements[i].dwILOffset; // Assembly - OBJECTREF pAssembly = pFunc->GetAssembly()->GetDomainAssembly()->GetExposedAssemblyObject(); + OBJECTREF pAssembly = pFunc->GetAssembly()->GetExposedObject(); pStackFrameHelper->rgAssembly->SetAt(iNumValidFrames, pAssembly); if (data.fDoWeHaveAnyFramesFromForeignStackTrace) |