Skip to content

Commit 68f61d6

Browse files
committed
os_windows: remove duplicated UMA handling
1 parent e904951 commit 68f61d6

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

src/hotspot/os/windows/os_windows.cpp

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2542,27 +2542,6 @@ LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo) {
25422542
return EXCEPTION_CONTINUE_SEARCH;
25432543
}
25442544

2545-
#ifdef _M_ARM64
2546-
// Unsafe memory access
2547-
CompiledMethod* nm = NULL;
2548-
JavaThread* thread = (JavaThread*)t;
2549-
if (in_java) {
2550-
CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
2551-
nm = (cb != NULL) ? cb->as_compiled_method_or_null() : NULL;
2552-
}
2553-
2554-
bool is_unsafe_arraycopy = (in_native || in_java) && UnsafeCopyMemory::contains_pc(pc);
2555-
if (is_unsafe_arraycopy ||
2556-
((in_vm || in_native) && thread->doing_unsafe_access()) ||
2557-
(nm != NULL && nm->has_unsafe_access())) {
2558-
address next_pc = Assembler::locate_next_instruction(pc);
2559-
if (is_unsafe_arraycopy) {
2560-
next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);
2561-
}
2562-
return Handle_Exception(exceptionInfo, SharedRuntime::handle_unsafe_access(thread, next_pc));
2563-
}
2564-
#endif
2565-
25662545
#ifdef _WIN64
25672546
// Special care for fast JNI field accessors.
25682547
// jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks

0 commit comments

Comments
 (0)