Skip to content

Commit f687644

Browse files
committed
8356153: Shenandoah stubs are missing in AOT Code Cache addresses table
Reviewed-by: kvn
1 parent 6719b92 commit f687644

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/hotspot/share/code/aotCodeCache.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
#if INCLUDE_G1GC
4949
#include "gc/g1/g1BarrierSetRuntime.hpp"
5050
#endif
51+
#if INCLUDE_SHENANDOAHGC
52+
#include "gc/shenandoah/shenandoahRuntime.hpp"
53+
#endif
5154
#if INCLUDE_ZGC
5255
#include "gc/z/zBarrierSetRuntime.hpp"
5356
#endif
@@ -976,9 +979,9 @@ ImmutableOopMapSet* AOTCodeReader::read_oop_map_set() {
976979
// [_blobs_base, _blobs_base + _blobs_max -1],
977980
// ...
978981
// [_c_str_base, _c_str_base + _c_str_max -1],
979-
#define _extrs_max 10
982+
#define _extrs_max 13
980983
#define _blobs_max 10
981-
#define _all_max 20
984+
#define _all_max 23
982985

983986
#define _extrs_base 0
984987
#define _blobs_base (_extrs_base + _extrs_max)
@@ -1012,6 +1015,11 @@ void AOTCodeAddressTable::init_extrs() {
10121015
SET_ADDRESS(_extrs, G1BarrierSetRuntime::write_ref_field_post_entry);
10131016
SET_ADDRESS(_extrs, G1BarrierSetRuntime::write_ref_field_pre_entry);
10141017
#endif
1018+
#if INCLUDE_SHENANDOAHGC
1019+
SET_ADDRESS(_extrs, ShenandoahRuntime::write_ref_field_pre);
1020+
SET_ADDRESS(_extrs, ShenandoahRuntime::load_reference_barrier_phantom);
1021+
SET_ADDRESS(_extrs, ShenandoahRuntime::load_reference_barrier_phantom_narrow);
1022+
#endif
10151023
#if INCLUDE_ZGC
10161024
SET_ADDRESS(_extrs, ZBarrierSetRuntime::load_barrier_on_phantom_oop_field_preloaded_addr());
10171025
#if defined(AMD64)

0 commit comments

Comments
 (0)