Skip to content

Commit cd16b68

Browse files
MBaeskenxmas92
andcommitted
8357155: [asan] ZGC does not work (x86_64 and ppc64)
Co-authored-by: Axel Boldt-Christmas <[email protected]> Reviewed-by: mdoerr, aboldtch
1 parent ab23500 commit cd16b68

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,15 @@ static size_t probe_valid_max_address_bit() {
9393
size_t ZPlatformAddressOffsetBits() {
9494
static const size_t valid_max_address_offset_bits = probe_valid_max_address_bit() + 1;
9595
const size_t max_address_offset_bits = valid_max_address_offset_bits - 3;
96+
#ifdef ADDRESS_SANITIZER
97+
// The max supported value is 44 because of other internal data structures.
98+
return MIN2(valid_max_address_offset_bits, (size_t)44);
99+
#else
96100
const size_t min_address_offset_bits = max_address_offset_bits - 2;
97101
const size_t address_offset = ZGlobalsPointers::min_address_offset_request();
98102
const size_t address_offset_bits = log2i_exact(address_offset);
99103
return clamp(address_offset_bits, min_address_offset_bits, max_address_offset_bits);
104+
#endif
100105
}
101106

102107
size_t ZPlatformAddressHeapBaseShift() {

src/hotspot/cpu/x86/gc/z/zAddress_x86.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,15 @@
3030
size_t ZPointerLoadShift;
3131

3232
size_t ZPlatformAddressOffsetBits() {
33+
#ifdef ADDRESS_SANITIZER
34+
return 44;
35+
#else
3336
const size_t min_address_offset_bits = 42; // 4TB
3437
const size_t max_address_offset_bits = 44; // 16TB
3538
const size_t address_offset = ZGlobalsPointers::min_address_offset_request();
3639
const size_t address_offset_bits = log2i_exact(address_offset);
3740
return clamp(address_offset_bits, min_address_offset_bits, max_address_offset_bits);
41+
#endif
3842
}
3943

4044
size_t ZPlatformAddressHeapBaseShift() {

0 commit comments

Comments
 (0)