archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8193266: AArch64: TestOptionsWithRanges.java SIGSEGV

Browse source 
Fix hotspot jtreg test runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java failure on AArch64.

Reviewed-by: aph, coleenp, dsamersoff
This commit is contained in:
Stuart Monteith 2018-03-20 22:54:02 +08:00
parent 221d0f4c54
commit 502b9b1da4
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
View file

@ -79,8 +79,8 @@ class MacroAssembler: public Assembler {
void call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions = true); void call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions = true);
// Maximum size of class area in Metaspace when compressed // True if an XOR can be used to expand narrow klass references.
uint64_t use_XOR_for_compressed_class_base; bool use_XOR_for_compressed_class_base;
public: public:
MacroAssembler(CodeBuffer* code) : Assembler(code) { MacroAssembler(CodeBuffer* code) : Assembler(code) {
@ -88,7 +88,7 @@ class MacroAssembler: public Assembler {
= (operand_valid_for_logical_immediate(false /*is32*/, = (operand_valid_for_logical_immediate(false /*is32*/,
(uint64_t)Universe::narrow_klass_base()) (uint64_t)Universe::narrow_klass_base())
&& ((uint64_t)Universe::narrow_klass_base() && ((uint64_t)Universe::narrow_klass_base()
> (1u << log2_intptr(CompressedClassSpaceSize)))); > (1UL << log2_intptr(Universe::narrow_klass_range()))));
} }
// These routines should emit JVMTI PopFrame and ForceEarlyReturn handling code. // These routines should emit JVMTI PopFrame and ForceEarlyReturn handling code.

3
src/hotspot/share/memory/metaspaceShared.cpp
View file

@ -234,6 +234,7 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() {
// with the archived ones, so it must be done after all encodings are determined. // with the archived ones, so it must be done after all encodings are determined.
mapinfo->map_heap_regions(); mapinfo->map_heap_regions();
} }
Universe::set_narrow_klass_range(CompressedClassSpaceSize);
#endif // _LP64 #endif // _LP64
} else { } else {
assert(!mapinfo->is_open() && !UseSharedSpaces, assert(!mapinfo->is_open() && !UseSharedSpaces,
@ -299,6 +300,8 @@ void MetaspaceShared::initialize_dumptime_shared_and_meta_spaces() {
// Set narrow_klass_shift to be LogKlassAlignmentInBytes. This is consistent // Set narrow_klass_shift to be LogKlassAlignmentInBytes. This is consistent
// with AOT. // with AOT.
Universe::set_narrow_klass_shift(LogKlassAlignmentInBytes); Universe::set_narrow_klass_shift(LogKlassAlignmentInBytes);
// Set the range of klass addresses to 4GB.
Universe::set_narrow_klass_range(cds_total);
Metaspace::initialize_class_space(tmp_class_space); Metaspace::initialize_class_space(tmp_class_space);
tty->print_cr("narrow_klass_base = " PTR_FORMAT ", narrow_klass_shift = %d", tty->print_cr("narrow_klass_base = " PTR_FORMAT ", narrow_klass_shift = %d",

1
src/hotspot/share/memory/universe.cpp
View file

@ -165,6 +165,7 @@ CollectedHeap* Universe::_collectedHeap = NULL;
NarrowPtrStruct Universe::_narrow_oop = { NULL, 0, true }; NarrowPtrStruct Universe::_narrow_oop = { NULL, 0, true };
NarrowPtrStruct Universe::_narrow_klass = { NULL, 0, true }; NarrowPtrStruct Universe::_narrow_klass = { NULL, 0, true };
address Universe::_narrow_ptrs_base; address Universe::_narrow_ptrs_base;
uint64_t Universe::_narrow_klass_range = (uint64_t(max_juint)+1);
void Universe::basic_type_classes_do(void f(Klass*)) { void Universe::basic_type_classes_do(void f(Klass*)) {
f(boolArrayKlassObj()); f(boolArrayKlassObj());

8
src/hotspot/share/memory/universe.hpp
View file

@ -194,7 +194,8 @@ class Universe: AllStatic {
// For UseCompressedClassPointers. // For UseCompressedClassPointers.
static struct NarrowPtrStruct _narrow_klass; static struct NarrowPtrStruct _narrow_klass;
static address _narrow_ptrs_base; static address _narrow_ptrs_base;
// CompressedClassSpaceSize set to 1GB, but appear 3GB away from _narrow_ptrs_base during CDS dump.
static uint64_t _narrow_klass_range;
// array of dummy objects used with +FullGCAlot // array of dummy objects used with +FullGCAlot
debug_only(static objArrayOop _fullgc_alot_dummy_array;) debug_only(static objArrayOop _fullgc_alot_dummy_array;)
// index of next entry to clear // index of next entry to clear
@ -244,6 +245,10 @@ class Universe: AllStatic {
assert(UseCompressedClassPointers, "no compressed klass ptrs?"); assert(UseCompressedClassPointers, "no compressed klass ptrs?");
_narrow_klass._base = base; _narrow_klass._base = base;
} }
static void set_narrow_klass_range(uint64_t range) {
assert(UseCompressedClassPointers, "no compressed klass ptrs?");
_narrow_klass_range = range;
}
static void set_narrow_oop_use_implicit_null_checks(bool use) { static void set_narrow_oop_use_implicit_null_checks(bool use) {
assert(UseCompressedOops, "no compressed ptrs?"); assert(UseCompressedOops, "no compressed ptrs?");
_narrow_oop._use_implicit_null_checks = use; _narrow_oop._use_implicit_null_checks = use;
@ -429,6 +434,7 @@ class Universe: AllStatic {
// For UseCompressedClassPointers // For UseCompressedClassPointers
static address narrow_klass_base() { return _narrow_klass._base; } static address narrow_klass_base() { return _narrow_klass._base; }
static bool is_narrow_klass_base(void* addr) { return (narrow_klass_base() == (address)addr); } static bool is_narrow_klass_base(void* addr) { return (narrow_klass_base() == (address)addr); }
static uint64_t narrow_klass_range() { return _narrow_klass_range; }
static int narrow_klass_shift() { return _narrow_klass._shift; } static int narrow_klass_shift() { return _narrow_klass._shift; }
static bool narrow_klass_use_implicit_null_checks() { return _narrow_klass._use_implicit_null_checks; } static bool narrow_klass_use_implicit_null_checks() { return _narrow_klass._use_implicit_null_checks; }