diff options
author | Jan Vorlicek <janvorli@microsoft.com> | 2016-08-12 03:47:07 +0300 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-08-12 03:47:07 +0300 |
commit | be6ba12cce4c4404729c4d4a5b462b458a36b8dc (patch) | |
tree | af8a94986645fbd3098714b5d7d893e620a7a77c /src/Native/Runtime/StackFrameIterator.h | |
parent | 91a33c98269c5f06ec980c30ef79fec06fccf3ce (diff) |
This fixes debugger step-in in the interface dispatch changes
[tfs-changeset: 1622102]
Diffstat (limited to 'src/Native/Runtime/StackFrameIterator.h')
-rw-r--r-- | src/Native/Runtime/StackFrameIterator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Native/Runtime/StackFrameIterator.h b/src/Native/Runtime/StackFrameIterator.h index 7299f952e..5e71ef2b6 100644 --- a/src/Native/Runtime/StackFrameIterator.h +++ b/src/Native/Runtime/StackFrameIterator.h @@ -57,11 +57,13 @@ 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. @@ -107,7 +109,9 @@ private: InManagedCode, InThrowSiteThunk, InFuncletInvokeThunk, +#ifdef LEGACY_INTERFACE_DISPATCH InManagedCalloutThunk, +#endif // LEGACY_INTERFACE_DISPATCH InCallDescrThunk, InUniversalTransitionThunk, }; |