more

rwestrel · Dec 12, 2023 · aa8f35d · aa8f35d
1 parent 03d5c3d
commit aa8f35d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -1863,9 +1863,9 @@ void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
 // function is recursive, to generate the required tree structured code.
 // It's the interpreter, so we are trading off code space for speed.
 // See below for example code.
-void
-InterpreterMacroAssembler::record_klass_in_profile_helper(Register receiver, Register mdp, Register reg2, int start_row,
-                                                          Label &done) {
+void InterpreterMacroAssembler::record_klass_in_profile_helper(Register receiver, Register mdp,
+                                                               Register reg2, int start_row,
+                                                               Label& done) {
   if (TypeProfileWidth == 0) {
     increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
   } else {

diff --git a/src/hotspot/share/ci/ciMethodData.cpp b/src/hotspot/share/ci/ciMethodData.cpp
@@ -761,7 +761,7 @@ void ciMethodData::dump_replay_data(outputStream* out) {
         ciArrayStoreData* array_store_data = (ciArrayStoreData*)pdata;
         dump_replay_data_type_helper(out, round, count, array_store_data, ciArrayStoreData::array_offset(),
                                      array_store_data->array()->valid_type());
-//        dump_replay_data_receiver_type_helper<ciArrayLoadStoreData>(out, round, count, array_store_data);
+        dump_replay_data_receiver_type_helper<ciArrayStoreData>(out, round, count, array_store_data);
       } else if (pdata->is_ArrayLoadData()) {
         ciArrayLoadData* array_load_data = (ciArrayLoadData*)pdata;
         dump_replay_data_type_helper(out, round, count, array_load_data, ciArrayLoadData::array_offset(),

diff --git a/src/hotspot/share/ci/ciMethodData.hpp b/src/hotspot/share/ci/ciMethodData.hpp
@@ -376,6 +376,9 @@ class ciArrayStoreData : public ArrayStoreData {
     rtd_super()->translate_receiver_data_from(data);
   }
 
+  ciKlass* receiver(uint row) {
+    return rtd_super()->receiver(row);
+  }
 #ifndef PRODUCT
   void print_data_on(outputStream* st, const char* extra = nullptr) const;
 #endif

diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -638,6 +638,7 @@
   declare_constant(DataLayout::parameters_type_data_tag)                  \
   declare_constant(DataLayout::speculative_trap_data_tag)                 \
   declare_constant(DataLayout::array_store_data_tag)                      \
+  declare_constant(DataLayout::array_load_data_tag)                       \
   declare_constant(DataLayout::acmp_data_tag)                             \
                                                                           \
   declare_constant(Deoptimization::Unpack_deopt)                          \