From 3e2abd742788fc5ba6f8234580129bf4da30d9a9 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Mon, 1 Aug 2022 17:33:17 +0200 Subject: [PATCH 1/3] Fix --- src/hotspot/cpu/x86/interp_masm_x86.cpp | 2 +- src/hotspot/cpu/x86/interpreterRT_x86_64.cpp | 4 ++-- src/hotspot/cpu/x86/stubGenerator_x86_64.cpp | 2 +- .../gc/shenandoah/shenandoahBarrierSet.inline.hpp | 4 ++-- src/hotspot/share/oops/access.hpp | 12 ++++++------ src/hotspot/share/runtime/objectMonitor.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp index c0c5c55b483d1..cc920b228e872 100644 --- a/src/hotspot/cpu/x86/interp_masm_x86.cpp +++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp @@ -1122,7 +1122,7 @@ void InterpreterMacroAssembler::remove_activation( bind(loop); // check if current entry is used - cmpptr(Address(rmon, BasicObjectLock::obj_offset_in_bytes()), (int32_t) NULL); + cmpptr(Address(rmon, BasicObjectLock::obj_offset_in_bytes()), (int32_t) NULL_WORD); jcc(Assembler::notEqual, exception); addptr(rmon, entry_size); // otherwise advance to next entry diff --git a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp index 31cc616dfce2f..1b313dcffb122 100644 --- a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp +++ b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp @@ -443,10 +443,10 @@ class SlowSignatureHandler _from -= Interpreter::stackElementSize; if (_num_int_args < Argument::n_int_register_parameters_c-1) { - *_int_args++ = (*from_addr == 0) ? NULL : (intptr_t)from_addr; + *_int_args++ = (*from_addr == 0) ? NULL_WORD : (intptr_t)from_addr; _num_int_args++; } else { - *_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr; + *_to++ = (*from_addr == 0) ? NULL_WORD : (intptr_t) from_addr; } } diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp index b4befba12faee..327bdfab2878c 100644 --- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp +++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp @@ -529,7 +529,7 @@ class StubGenerator: public StubCodeGenerator { // make sure this code is only executed if there is a pending exception { Label L; - __ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t) NULL); + __ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t) NULL_WORD); __ jcc(Assembler::notEqual, L); __ stop("StubRoutines::forward exception: no pending exception (1)"); __ bind(L); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp index 66313e7eb5699..860e014f02917 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp @@ -200,7 +200,7 @@ inline oop ShenandoahBarrierSet::oop_cmpxchg(DecoratorSet decorators, T* addr, o // Note: We don't need a keep-alive-barrier here. We already enqueue any loaded reference for SATB anyway, // because it must be the previous value. - res = load_reference_barrier(decorators, res, reinterpret_cast(NULL)); + res = load_reference_barrier(decorators, res, static_cast(nullptr)); satb_enqueue(res); return res; } @@ -211,7 +211,7 @@ inline oop ShenandoahBarrierSet::oop_xchg(DecoratorSet decorators, T* addr, oop oop previous = RawAccess<>::oop_atomic_xchg(addr, new_value); // Note: We don't need a keep-alive-barrier here. We already enqueue any loaded reference for SATB anyway, // because it must be the previous value. - previous = load_reference_barrier(decorators, previous, reinterpret_cast(NULL)); + previous = load_reference_barrier(decorators, previous, static_cast(nullptr)); satb_enqueue(previous); return previous; } diff --git a/src/hotspot/share/oops/access.hpp b/src/hotspot/share/oops/access.hpp index 47e6bd27ea0c5..6531dc6614586 100644 --- a/src/hotspot/share/oops/access.hpp +++ b/src/hotspot/share/oops/access.hpp @@ -294,8 +294,8 @@ class ArrayAccess: public HeapAccess { static inline void arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, arrayOop dst_obj, size_t dst_offset_in_bytes, size_t length) { - AccessT::arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast(NULL), - dst_obj, dst_offset_in_bytes, reinterpret_cast(NULL), + AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast(NULL), + dst_obj, dst_offset_in_bytes, static_cast(NULL), length); } @@ -303,7 +303,7 @@ class ArrayAccess: public HeapAccess { static inline void arraycopy_to_native(arrayOop src_obj, size_t src_offset_in_bytes, T* dst, size_t length) { - AccessT::arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast(NULL), + AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast(NULL), NULL, 0, dst, length); } @@ -313,15 +313,15 @@ class ArrayAccess: public HeapAccess { arrayOop dst_obj, size_t dst_offset_in_bytes, size_t length) { AccessT::arraycopy(NULL, 0, src, - dst_obj, dst_offset_in_bytes, reinterpret_cast(NULL), + dst_obj, dst_offset_in_bytes, static_cast(nullptr), length); } static inline bool oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, arrayOop dst_obj, size_t dst_offset_in_bytes, size_t length) { - return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast(NULL), - dst_obj, dst_offset_in_bytes, reinterpret_cast(NULL), + return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, static_cast(NULL), + dst_obj, dst_offset_in_bytes, static_cast(NULL), length); } diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp index fa5b1bc1d14b4..50ab95e166906 100644 --- a/src/hotspot/share/runtime/objectMonitor.cpp +++ b/src/hotspot/share/runtime/objectMonitor.cpp @@ -668,7 +668,7 @@ const char* ObjectMonitor::is_busy_to_string(stringStream* ss) { } else { // We report NULL instead of DEFLATER_MARKER here because is_busy() // ignores DEFLATER_MARKER values. - ss->print("owner=" INTPTR_FORMAT, NULL); + ss->print("owner=" INTPTR_FORMAT, NULL_WORD); } ss->print(", cxq=" INTPTR_FORMAT ", EntryList=" INTPTR_FORMAT, p2i(_cxq), p2i(_EntryList)); From 59f92b414b113bb53c7dca10ec6de0467d8fabef Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Mon, 1 Aug 2022 18:53:01 +0200 Subject: [PATCH 2/3] More work --- src/hotspot/cpu/x86/interpreterRT_x86_64.cpp | 4 ++-- src/hotspot/share/oops/access.hpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp index 1b313dcffb122..11388c8cd5d3b 100644 --- a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp +++ b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp @@ -348,10 +348,10 @@ class SlowSignatureHandler intptr_t *from_addr = (intptr_t*)(_from + Interpreter::local_offset_in_bytes(0)); _from -= Interpreter::stackElementSize; if (_num_args < Argument::n_int_register_parameters_c-1) { - *_reg_args++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr; + *_reg_args++ = (*from_addr == 0) ? NULL_WORD : (intptr_t) from_addr; _num_args++; } else { - *_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr; + *_to++ = (*from_addr == 0) ? NULL_WORD : (intptr_t) from_addr; } } diff --git a/src/hotspot/share/oops/access.hpp b/src/hotspot/share/oops/access.hpp index 6531dc6614586..a2850148f678c 100644 --- a/src/hotspot/share/oops/access.hpp +++ b/src/hotspot/share/oops/access.hpp @@ -294,8 +294,8 @@ class ArrayAccess: public HeapAccess { static inline void arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, arrayOop dst_obj, size_t dst_offset_in_bytes, size_t length) { - AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast(NULL), - dst_obj, dst_offset_in_bytes, static_cast(NULL), + AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast(nullptr), + dst_obj, dst_offset_in_bytes, static_cast(nullptr), length); } @@ -303,7 +303,7 @@ class ArrayAccess: public HeapAccess { static inline void arraycopy_to_native(arrayOop src_obj, size_t src_offset_in_bytes, T* dst, size_t length) { - AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast(NULL), + AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast(nullptr), NULL, 0, dst, length); } @@ -320,8 +320,8 @@ class ArrayAccess: public HeapAccess { static inline bool oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes, arrayOop dst_obj, size_t dst_offset_in_bytes, size_t length) { - return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, static_cast(NULL), - dst_obj, dst_offset_in_bytes, static_cast(NULL), + return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, static_cast(nullptr), + dst_obj, dst_offset_in_bytes, static_cast(nullptr), length); } From 3d3dbc3cf3a317cdb05a589fb5457748b59a5b12 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Wed, 3 Aug 2022 10:43:59 +0200 Subject: [PATCH 3/3] Copyright years --- src/hotspot/cpu/x86/interpreterRT_x86_64.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp index 11388c8cd5d3b..7e390564f4c42 100644 --- a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp +++ b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it