diff options
author | Yongseop Kim <yons.kim@samsung.com> | 2017-03-01 23:52:35 +0900 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-03-01 15:52:35 +0100 |
commit | e491a912e393610f1c987f1f814fdd3d04160479 (patch) | |
tree | 17e93607b0d46d4ab5b4a544eb5a179542404841 /src/vm/arm | |
parent | af6738e34d1c5942dd23eed03c629a5dfaaae10c (diff) | |
download | coreclr-e491a912e393610f1c987f1f814fdd3d04160479.tar.gz coreclr-e491a912e393610f1c987f1f814fdd3d04160479.tar.bz2 coreclr-e491a912e393610f1c987f1f814fdd3d04160479.zip |
[x86/linux] Add IsIPinVirtualStub() on x86/linux (#9844)
* [x86/linux] Add IsIPinVirtualStub() on x86/linux #9691
To pass Loader.classloader.methodoverriding.regressions.549411.exploit
test failure on x86/linux. This patch is from #5542.
Diffstat (limited to 'src/vm/arm')
-rw-r--r-- | src/vm/arm/exceparm.cpp | 32 | ||||
-rw-r--r-- | src/vm/arm/excepcpu.h | 1 |
2 files changed, 0 insertions, 33 deletions
diff --git a/src/vm/arm/exceparm.cpp b/src/vm/arm/exceparm.cpp index 6852adcc33..9b14d41c83 100644 --- a/src/vm/arm/exceparm.cpp +++ b/src/vm/arm/exceparm.cpp @@ -54,38 +54,6 @@ FaultingExceptionFrame *GetFrameFromRedirectedStubStackFrame (T_DISPATCHER_CONTE return (FaultingExceptionFrame*)((TADDR)pDispatcherContext->ContextRecord->R4); } -//Return TRUE if pContext->Pc is in VirtualStub -BOOL IsIPinVirtualStub(PCODE f_IP) -{ - LIMITED_METHOD_CONTRACT; - - Thread * pThread = GetThread(); - - // We may not have a managed thread object. Example is an AV on the helper thread. - // (perhaps during StubManager::IsStub) - if (pThread == NULL) - { - return FALSE; - } - - VirtualCallStubManager::StubKind sk; - VirtualCallStubManager::FindStubManager(f_IP, &sk); - - if (sk == VirtualCallStubManager::SK_DISPATCH) - { - return TRUE; - } - else if (sk == VirtualCallStubManager::SK_RESOLVE) - { - return TRUE; - } - - else { - return FALSE; - } -} - - // Returns TRUE if caller should resume execution. BOOL AdjustContextForVirtualStub( diff --git a/src/vm/arm/excepcpu.h b/src/vm/arm/excepcpu.h index f13d81fdcb..fc0c44e5de 100644 --- a/src/vm/arm/excepcpu.h +++ b/src/vm/arm/excepcpu.h @@ -46,6 +46,5 @@ PCODE GetAdjustedCallAddress(PCODE returnAddress) } BOOL AdjustContextForVirtualStub(EXCEPTION_RECORD *pExceptionRecord, T_CONTEXT *pContext); -BOOL IsIPinVirtualStub(PCODE f_IP); #endif // __excepcpu_h__ |