src/share/vm/jvmci/jvmciCodeInstaller.hpp

*** 105,118 ****
      POLL_NEAR                  = 11,
      POLL_RETURN_NEAR           = 12,
      POLL_FAR                   = 13,
      POLL_RETURN_FAR            = 14,
      CARD_TABLE_ADDRESS         = 15,
!     HEAP_TOP_ADDRESS           = 16,
!     HEAP_END_ADDRESS           = 17,
!     NARROW_KLASS_BASE_ADDRESS  = 18,
!     CRC_TABLE_ADDRESS          = 19,
      INVOKE_INVALID             = -1
    };
  
    Arena         _arena;
  
--- 105,119 ----
      POLL_NEAR                  = 11,
      POLL_RETURN_NEAR           = 12,
      POLL_FAR                   = 13,
      POLL_RETURN_FAR            = 14,
      CARD_TABLE_ADDRESS         = 15,
!     CARD_TABLE_SHIFT           = 16,
!     HEAP_TOP_ADDRESS           = 17,
!     HEAP_END_ADDRESS           = 18,
!     NARROW_KLASS_BASE_ADDRESS  = 19,
!     CRC_TABLE_ADDRESS          = 20,
      INVOKE_INVALID             = -1
    };
  
    Arena         _arena;
  
*** 153,164 ****
    static ConstantIntValue*    _int_2_scope_value;
    static LocationValue*       _illegal_value;
  
    jint pd_next_offset(NativeInstruction* inst, jint pc_offset, oop method);
    void pd_patch_OopConstant(int pc_offset, Handle& constant);
    void pd_patch_DataSectionReference(int pc_offset, int data_offset);
-   void pd_relocate_CodeBlob(CodeBlob* cb, NativeInstruction* inst);
    void pd_relocate_ForeignCall(NativeInstruction* inst, jlong foreign_call_destination);
    void pd_relocate_JavaMethod(oop method, jint pc_offset);
    void pd_relocate_poll(address pc, jint mark);
  
    objArrayOop sites() { return (objArrayOop) JNIHandles::resolve(_sites_handle); }
--- 154,165 ----
    static ConstantIntValue*    _int_2_scope_value;
    static LocationValue*       _illegal_value;
  
    jint pd_next_offset(NativeInstruction* inst, jint pc_offset, oop method);
    void pd_patch_OopConstant(int pc_offset, Handle& constant);
+   void pd_patch_MetaspaceConstant(int pc_offset, Handle& constant);
    void pd_patch_DataSectionReference(int pc_offset, int data_offset);
    void pd_relocate_ForeignCall(NativeInstruction* inst, jlong foreign_call_destination);
    void pd_relocate_JavaMethod(oop method, jint pc_offset);
    void pd_relocate_poll(address pc, jint mark);
  
    objArrayOop sites() { return (objArrayOop) JNIHandles::resolve(_sites_handle); }
*** 168,182 ****
    objArrayOop exception_handlers() { return (objArrayOop) JNIHandles::resolve(_exception_handlers_handle); }
  #ifndef PRODUCT
    objArrayOop comments() { return (objArrayOop) JNIHandles::resolve(_comments_handle); }
  #endif
  
-   void record_resolved(oop obj);
- 
    oop word_kind() { return (oop) JNIHandles::resolve(_word_kind_handle); }
  
  public:
    CodeInstaller() : _arena(mtCompiler) {}
  
    JVMCIEnv::CodeInstallResult gather_metadata(Handle target, Handle& compiled_code, CodeMetadata& metadata);
    JVMCIEnv::CodeInstallResult install(JVMCICompiler* compiler, Handle target, Handle& compiled_code, CodeBlob*& cb, Handle installed_code, Handle speculation_log);
  
--- 169,182 ----
    objArrayOop exception_handlers() { return (objArrayOop) JNIHandles::resolve(_exception_handlers_handle); }
  #ifndef PRODUCT
    objArrayOop comments() { return (objArrayOop) JNIHandles::resolve(_comments_handle); }
  #endif
  
    oop word_kind() { return (oop) JNIHandles::resolve(_word_kind_handle); }
  
  public:
+ 
    CodeInstaller() : _arena(mtCompiler) {}
  
    JVMCIEnv::CodeInstallResult gather_metadata(Handle target, Handle& compiled_code, CodeMetadata& metadata);
    JVMCIEnv::CodeInstallResult install(JVMCICompiler* compiler, Handle target, Handle& compiled_code, CodeBlob*& cb, Handle installed_code, Handle speculation_log);
  
*** 189,198 ****
--- 189,203 ----
  protected:
    Location::Type get_oop_type(oop value);
    ScopeValue* get_scope_value(oop value, BasicType type, GrowableArray<ScopeValue*>* objects, ScopeValue* &second);
    MonitorValue* get_monitor_value(oop value, GrowableArray<ScopeValue*>* objects);
  
+   Metadata* record_metadata_reference(Handle& constant);
+ #ifdef _LP64
+   narrowKlass record_narrow_metadata_reference(Handle& constant);
+ #endif
+ 
    // extract the fields of the CompilationResult
    void initialize_fields(oop target, oop target_method);
    void initialize_dependencies(oop target_method, OopRecorder* oop_recorder);
  
    int estimate_stubs_size();