Skip to content

Commit 2bdad9f

Browse files
committed
Revert "Windows AArch64 safefetch implementation should not use structured exception handling"
This reverts commit 62651d6.
1 parent a53b99f commit 2bdad9f

File tree

6 files changed

+1
-141
lines changed

6 files changed

+1
-141
lines changed

src/hotspot/os/windows/os_windows.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2752,10 +2752,6 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
27522752
// Verify that OS save/restore AVX registers.
27532753
return Handle_Exception(exceptionInfo, VM_Version::cpuinfo_cont_addr());
27542754
}
2755-
#elif defined(_M_ARM64)
2756-
if (handle_safefetch(exception_code, pc, (void*)exceptionInfo->ContextRecord)) {
2757-
return EXCEPTION_CONTINUE_EXECUTION;
2758-
}
27592755
#endif
27602756

27612757
if (t != nullptr && t->is_Java_thread()) {

src/hotspot/os/windows/os_windows.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,6 @@ class os::win32 {
172172
// signal support
173173
static void* install_signal_handler(int sig, signal_handler_t handler);
174174
static void* user_handler();
175-
176-
static void context_set_pc(CONTEXT* uc, address pc);
177175
};
178176

179177
#endif // OS_WINDOWS_OS_WINDOWS_HPP

src/hotspot/os/windows/safefetch_static_windows.cpp

Lines changed: 0 additions & 65 deletions
This file was deleted.

src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
9999
return frame(sp, fp, epc);
100100
}
101101

102-
void os::win32::context_set_pc(CONTEXT* uc, address pc) {
103-
uc->Pc = (intptr_t)pc;
104-
}
105-
106102
bool os::win32::get_frame_at_stack_banging_point(JavaThread* thread,
107103
struct _EXCEPTION_POINTERS* exceptionInfo, address pc, frame* fr) {
108104
PEXCEPTION_RECORD exceptionRecord = exceptionInfo->ExceptionRecord;

src/hotspot/os_cpu/windows_aarch64/safefetch_windows_aarch64.S

Lines changed: 0 additions & 65 deletions
This file was deleted.

src/hotspot/share/runtime/safefetch.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
// Safefetch allows to load a value from a location that's not known
3232
// to be valid. If the load causes a fault, the error value is returned.
3333

34-
#if defined(_WIN32) && !defined(_M_ARM64)
34+
#ifdef _WIN32
3535
// Windows uses Structured Exception Handling
3636
#include "safefetch_windows.hpp"
3737
#elif defined(ZERO) || defined (_AIX)

0 commit comments

Comments
 (0)