diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-02-10 18:59:23 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-02-10 10:59:23 +0100 |
| commit | e6965ec4891e3f2b14003822d3befbaa09c42dcb (patch) | |
| tree | 18839aec02270ae6ff72d85e151c745228b07ac1 | |
| parent | e62b0f82a9c5bb770ac27ad2616074a32dbf0325 (diff) | |
| download | coreclr-e6965ec4891e3f2b14003822d3befbaa09c42dcb.tar.gz coreclr-e6965ec4891e3f2b14003822d3befbaa09c42dcb.tar.bz2 coreclr-e6965ec4891e3f2b14003822d3befbaa09c42dcb.zip | |
Hide VirtualUnwindXXX for DACESS_COMPILE (#9407)
| -rw-r--r-- | src/vm/stackwalk.cpp | 17 | ||||
| -rw-r--r-- | src/vm/threads.h | 2 |
2 files changed, 4 insertions, 15 deletions
diff --git a/src/vm/stackwalk.cpp b/src/vm/stackwalk.cpp index 36af466e12..ffcd453cd7 100644 --- a/src/vm/stackwalk.cpp +++ b/src/vm/stackwalk.cpp @@ -658,20 +658,7 @@ PCODE Thread::VirtualUnwindCallFrame(T_CONTEXT* pContext, return uControlPc; } -#ifdef DACCESS_COMPILE - -PCODE Thread::VirtualUnwindLeafCallFrame(T_CONTEXT* pContext) -{ - DacNotImpl(); - return 0; -} -UINT_PTR Thread::VirtualUnwindToFirstManagedCallFrame(T_CONTEXT* pContext) -{ - DacNotImpl(); - return 0; -} - -#else // !DACCESS_COMPILE +#ifndef DACCESS_COMPILE // static PCODE Thread::VirtualUnwindLeafCallFrame(T_CONTEXT* pContext) @@ -796,7 +783,7 @@ UINT_PTR Thread::VirtualUnwindToFirstManagedCallFrame(T_CONTEXT* pContext) return uControlPc; } -#endif // DACCESS_COMPILE +#endif // !DACCESS_COMPILE #endif // WIN64EXCEPTIONS #ifdef _DEBUG diff --git a/src/vm/threads.h b/src/vm/threads.h index 51116e1ad6..0d0dd30cae 100644 --- a/src/vm/threads.h +++ b/src/vm/threads.h @@ -3615,10 +3615,12 @@ public: static PCODE VirtualUnwindCallFrame(T_CONTEXT* pContext, T_KNONVOLATILE_CONTEXT_POINTERS* pContextPointers = NULL, EECodeInfo * pCodeInfo = NULL); static UINT_PTR VirtualUnwindCallFrame(PREGDISPLAY pRD, EECodeInfo * pCodeInfo = NULL); +#ifndef DACCESS_COMPILE static PCODE VirtualUnwindLeafCallFrame(T_CONTEXT* pContext); static PCODE VirtualUnwindNonLeafCallFrame(T_CONTEXT* pContext, T_KNONVOLATILE_CONTEXT_POINTERS* pContextPointers = NULL, PT_RUNTIME_FUNCTION pFunctionEntry = NULL, UINT_PTR uImageBase = NULL); static UINT_PTR VirtualUnwindToFirstManagedCallFrame(T_CONTEXT* pContext); +#endif // DACCESS_COMPILE #endif // WIN64EXCEPTIONS // During a <clinit>, this thread must not be asynchronously |