Skip to content

Commit 60402f8

Browse files
Ashutosh Mehrajerboaa
authored andcommitted
8330275: Crash in XMark::follow_array
Reviewed-by: stuefe Backport-of: 42b1d85
1 parent 2e327a9 commit 60402f8

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/hotspot/cpu/aarch64/gc/x/xGlobals_aarch64.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,11 @@
142142
// * 63-48 Fixed (16-bits, always zero)
143143
//
144144

145-
// Default value if probing is not implemented for a certain platform: 128TB
146-
static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
147-
// Minimum value returned, if probing fails: 64GB
145+
// Default value if probing is not implemented for a certain platform
146+
// Max address bit is restricted by implicit assumptions in the code, for instance
147+
// the bit layout of XForwardingEntry or Partial array entry (see XMarkStackEntry) in mark stack
148+
static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
149+
// Minimum value returned, if probing fails
148150
static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
149151

150152
static size_t probe_valid_max_address_bit() {

src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@
3636
#include <sys/mman.h>
3737
#endif // LINUX
3838

39-
// Default value if probing is not implemented for a certain platform: 128TB
40-
static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
41-
// Minimum value returned, if probing fails: 64GB
39+
// Default value if probing is not implemented for a certain platform
40+
// Max address bit is restricted by implicit assumptions in the code, for instance
41+
// the bit layout of XForwardingEntry or Partial array entry (see XMarkStackEntry) in mark stack
42+
static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
43+
// Minimum value returned, if probing fail
4244
static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
4345

4446
static size_t probe_valid_max_address_bit() {

0 commit comments

Comments
 (0)