Skip to content

Commit a1cac8d

Browse files
committed
Call the top level exception filter unconditionally
1 parent bb2611a commit a1cac8d

1 file changed

Lines changed: 1 addition & 22 deletions

File tree

src/hotspot/os/windows/os_windows.cpp

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2815,28 +2815,7 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
28152815

28162816
#if defined(USE_VECTORED_EXCEPTION_HANDLING)
28172817
LONG WINAPI topLevelVectoredExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
2818-
PEXCEPTION_RECORD exceptionRecord = exceptionInfo->ExceptionRecord;
2819-
#if defined(_M_ARM64)
2820-
address pc = (address) exceptionInfo->ContextRecord->Pc;
2821-
#elif defined(_M_AMD64)
2822-
address pc = (address) exceptionInfo->ContextRecord->Rip;
2823-
#else
2824-
#error unknown architecture
2825-
#endif
2826-
2827-
// Fast path for code part of the code cache
2828-
if (CodeCache::low_bound() <= pc && pc < CodeCache::high_bound()) {
2829-
return topLevelExceptionFilter(exceptionInfo);
2830-
}
2831-
2832-
// If the exception occurred in the codeCache, pass control
2833-
// to our normal exception handler.
2834-
CodeBlob* cb = CodeCache::find_blob(pc);
2835-
if (cb != nullptr) {
2836-
return topLevelExceptionFilter(exceptionInfo);
2837-
}
2838-
2839-
return EXCEPTION_CONTINUE_SEARCH;
2818+
return topLevelExceptionFilter(exceptionInfo);
28402819
}
28412820
#endif
28422821

0 commit comments

Comments
 (0)