diff options
author | David Wrighton <davidwr@microsoft.com> | 2016-07-16 02:20:44 +0300 |
---|---|---|
committer | David Wrighton <davidwr@microsoft.com> | 2016-07-16 02:20:44 +0300 |
commit | 42903f18a8f0f0cae7da78ed51cb34f579d25a93 (patch) | |
tree | af58462aa7bd555508b24732200dfd2b7d16905a /src/Native/Runtime/StackFrameIterator.h | |
parent | e43c7b17315fa756e15f06a57d188cb974798bf2 (diff) |
Rollback change 1618006 : Replace use of ManagedCalloutThunk with Universal Thunk
This broke debugger stepping through interface dispatch in some circumstances
[tfs-changeset: 1618045]
Diffstat (limited to 'src/Native/Runtime/StackFrameIterator.h')
-rw-r--r-- | src/Native/Runtime/StackFrameIterator.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/Native/Runtime/StackFrameIterator.h b/src/Native/Runtime/StackFrameIterator.h index 5e71ef2b6..7299f952e 100644 --- a/src/Native/Runtime/StackFrameIterator.h +++ b/src/Native/Runtime/StackFrameIterator.h @@ -57,13 +57,11 @@ public: void GetStackRangeToReportConservatively(PTR_RtuObjectRef * ppLowerBound, PTR_RtuObjectRef * ppUpperBound); private: -#ifdef LEGACY_INTERFACE_DISPATCH // If our control PC indicates that we're in one of the thunks we use to make managed callouts from the // runtime we need to adjust the frame state to that of the managed method that previously called into the // runtime (i.e. skip the intervening unmanaged frames). // NOTE: This function always publishes a non-NULL conservative stack range lower bound. void UnwindManagedCalloutThunk(); -#endif // LEGACY_INTERFACE_DISPATCH // The invoke of a funclet is a bit special and requires an assembly thunk, but we don't want to break the // stackwalk due to this. So this routine will unwind through the assembly thunks used to invoke funclets. @@ -109,9 +107,7 @@ private: InManagedCode, InThrowSiteThunk, InFuncletInvokeThunk, -#ifdef LEGACY_INTERFACE_DISPATCH InManagedCalloutThunk, -#endif // LEGACY_INTERFACE_DISPATCH InCallDescrThunk, InUniversalTransitionThunk, }; |