Skip to content

Commit dd0b641

Browse files
committedMay 2, 2024
8330813: Don't call methods from Compressed(Oops|Klass) if the associated mode is inactive
Reviewed-by: stefank, asmehra
1 parent 389f6fe commit dd0b641

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed
 

‎src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp

+14-4
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,20 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
175175

176176
Universe_collectedHeap = Universe::heap();
177177
Universe_base_vtable_size = Universe::base_vtable_size();
178-
Universe_narrow_oop_base = CompressedOops::base();
179-
Universe_narrow_oop_shift = CompressedOops::shift();
180-
Universe_narrow_klass_base = CompressedKlassPointers::base();
181-
Universe_narrow_klass_shift = CompressedKlassPointers::shift();
178+
if (UseCompressedOops) {
179+
Universe_narrow_oop_base = CompressedOops::base();
180+
Universe_narrow_oop_shift = CompressedOops::shift();
181+
} else {
182+
Universe_narrow_oop_base = nullptr;
183+
Universe_narrow_oop_shift = 0;
184+
}
185+
if (UseCompressedClassPointers) {
186+
Universe_narrow_klass_base = CompressedKlassPointers::base();
187+
Universe_narrow_klass_shift = CompressedKlassPointers::shift();
188+
} else {
189+
Universe_narrow_klass_base = nullptr;
190+
Universe_narrow_klass_shift = 0;
191+
}
182192
Universe_non_oop_bits = Universe::non_oop_word();
183193
Universe_verify_oop_mask = Universe::verify_oop_mask();
184194
Universe_verify_oop_bits = Universe::verify_oop_bits();

0 commit comments

Comments
 (0)