summaryrefslogtreecommitdiff
path: root/src/debug/ee/frameinfo.cpp
diff options
context:
space:
mode:
authorDavid Wrighton <davidwr@microsoft.com>2018-05-14 16:20:12 -0700
committerGitHub <noreply@github.com>2018-05-14 16:20:12 -0700
commited9c82a956116f78fdaef781d99c3a22b01bfd27 (patch)
tree397091fc6f64b3de3f1e7770c866b245d483fbda /src/debug/ee/frameinfo.cpp
parent95a9055dbe5f6233f75ee2d7b6194e18cc4977fd (diff)
downloadcoreclr-ed9c82a956116f78fdaef781d99c3a22b01bfd27.tar.gz
coreclr-ed9c82a956116f78fdaef781d99c3a22b01bfd27.tar.bz2
coreclr-ed9c82a956116f78fdaef781d99c3a22b01bfd27.zip
Fix multicast delegate step from delegate (#17990)
- Replace incorrect FEATURE_STUBS_AS_IL define check with FEATURE_MULTICASTSTUB_AS_IL - Allows step from one delegate to the next and step out from multicast delegate to function correctly. - Add null check as the active frame's methoddesc isn't always non-null - In scenarios such as FuncEval, we also run through this code, and the md may be null. - Fix unwind from StubHelpers::MulticastDebuggerTraceHelper function on amd64
Diffstat (limited to 'src/debug/ee/frameinfo.cpp')
-rw-r--r--src/debug/ee/frameinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/debug/ee/frameinfo.cpp b/src/debug/ee/frameinfo.cpp
index fb9ea886bf..0387ca9217 100644
--- a/src/debug/ee/frameinfo.cpp
+++ b/src/debug/ee/frameinfo.cpp
@@ -1563,7 +1563,7 @@ StackWalkAction DebuggerWalkStackProc(CrawlFrame *pCF, void *data)
// The only exception is dynamic methods. We want to report them when SIS is turned on.
if ((md != NULL) && md->IsILStub() && pCF->IsFrameless())
{
-#ifdef FEATURE_STUBS_AS_IL
+#ifdef FEATURE_MULTICASTSTUB_AS_IL
if(md->AsDynamicMethodDesc()->IsMulticastStub())
{
use = true;