src/hotspot/share/oops/constantPool.hpp

@@ -242,12 +242,12 @@
                                        const intStack& reference_map,
                                        int constant_pool_map_length,
                                        TRAPS);
  
    // resolved strings, methodHandles and callsite objects from the constant pool
-   objArrayOop resolved_references()  const;
-   objArrayOop resolved_references_or_null()  const;
+   refArrayOop resolved_references()  const;
+   refArrayOop resolved_references_or_null()  const;
    oop resolved_reference_at(int obj_index) const;
    oop set_resolved_reference_at(int index, oop new_value);
  
    // mapping resolved object array indexes to cp indexes and back.
    int object_to_cp_index(int index)         { return reference_map()->at(index); }

@@ -601,11 +601,11 @@
      resolve_string_constants_impl(h_this, CHECK);
    }
  
  #if INCLUDE_CDS
    // CDS support
-   objArrayOop prepare_resolved_references_for_archiving() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
+   refArrayOop prepare_resolved_references_for_archiving() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
    void remove_unshareable_info();
    void restore_unshareable_info(TRAPS);
  private:
    void remove_unshareable_entries();
    void remove_resolved_klass_if_non_deterministic(int cp_index);

@@ -642,11 +642,11 @@
      return resolve_constant_at_impl(h_this, cp_index, _possible_index_sentinel, &found_it, THREAD);
    }
  
    void copy_bootstrap_arguments_at(int cp_index,
                                     int start_arg, int end_arg,
-                                    objArrayHandle info, int pos,
+                                    refArrayHandle info, int pos,
                                     bool must_resolve, Handle if_not_available, TRAPS) {
      constantPoolHandle h_this(THREAD, this);
      copy_bootstrap_arguments_at_impl(h_this, cp_index, start_arg, end_arg,
                                       info, pos, must_resolve, if_not_available, THREAD);
    }

@@ -741,11 +741,11 @@
  
    static oop resolve_constant_at_impl(const constantPoolHandle& this_cp, int cp_index, int cache_index,
                                        bool* status_return, TRAPS);
    static void copy_bootstrap_arguments_at_impl(const constantPoolHandle& this_cp, int cp_index,
                                                 int start_arg, int end_arg,
-                                                objArrayHandle info, int pos,
+                                                refArrayHandle info, int pos,
                                                 bool must_resolve, Handle if_not_available, TRAPS);
  
    // Exception handling
    static void save_and_throw_exception(const constantPoolHandle& this_cp, int cp_index, constantTag tag, TRAPS);