Skip to content

Commit 098afc8

Browse files
coleenpoffamitkumar
andcommittedJan 7, 2025
8339113: AccessFlags can be u2 in metadata
Co-authored-by: Amit Kumar <amitkumar@openjdk.org> Reviewed-by: sspitsyn, vlivanov, yzheng, dlong, dholmes
1 parent e413fc6 commit 098afc8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+278
-283
lines changed
 

‎src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -503,7 +503,7 @@ void InterpreterMacroAssembler::remove_activation(
503503

504504
// get method access flags
505505
ldr(r1, Address(rfp, frame::interpreter_frame_method_offset * wordSize));
506-
ldr(r2, Address(r1, Method::access_flags_offset()));
506+
ldrh(r2, Address(r1, Method::access_flags_offset()));
507507
tbz(r2, exact_log2(JVM_ACC_SYNCHRONIZED), unlocked);
508508

509509
// Don't unlock anything if the _do_not_unlock_if_synchronized flag

‎src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
44
* Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
55
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -760,7 +760,7 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
760760
Label L_skip_barrier;
761761

762762
{ // Bypass the barrier for non-static methods
763-
__ ldrw(rscratch1, Address(rmethod, Method::access_flags_offset()));
763+
__ ldrh(rscratch1, Address(rmethod, Method::access_flags_offset()));
764764
__ andsw(zr, rscratch1, JVM_ACC_STATIC);
765765
__ br(Assembler::EQ, L_skip_barrier); // non-static
766766
}

0 commit comments

Comments
 (0)
Please sign in to comment.