src/hotspot/share/compiler/oopMap.cpp

*** 266,278 ****
  
  static void add_derived_oop(oop* base, oop* derived) {
  #if !defined(TIERED) && !defined(INCLUDE_JVMCI)
    COMPILER1_PRESENT(ShouldNotReachHere();)
  #endif // !defined(TIERED) && !defined(INCLUDE_JVMCI)
! #if defined(COMPILER2) || INCLUDE_JVMCI
    DerivedPointerTable::add(derived, base);
! #endif // COMPILER2 || INCLUDE_JVMCI
  }
  
  
  #ifndef PRODUCT
  static void trace_codeblob_maps(const frame *fr, const RegisterMap *reg_map) {
--- 266,278 ----
  
  static void add_derived_oop(oop* base, oop* derived) {
  #if !defined(TIERED) && !defined(INCLUDE_JVMCI)
    COMPILER1_PRESENT(ShouldNotReachHere();)
  #endif // !defined(TIERED) && !defined(INCLUDE_JVMCI)
! #if COMPILER2_OR_JVMCI
    DerivedPointerTable::add(derived, base);
! #endif // COMPILER2_OR_JVMCI
  }
  
  
  #ifndef PRODUCT
  static void trace_codeblob_maps(const frame *fr, const RegisterMap *reg_map) {
*** 459,474 ****
  
  bool ImmutableOopMap::has_derived_pointer() const {
  #if !defined(TIERED) && !defined(INCLUDE_JVMCI)
    COMPILER1_PRESENT(return false);
  #endif // !TIERED
! #if defined(COMPILER2) || INCLUDE_JVMCI
    OopMapStream oms(this,OopMapValue::derived_oop_value);
    return oms.is_done();
  #else
    return false;
! #endif // COMPILER2 || INCLUDE_JVMCI
  }
  
  #endif //PRODUCT
  
  // Printing code is present in product build for -XX:+PrintAssembly.
--- 459,474 ----
  
  bool ImmutableOopMap::has_derived_pointer() const {
  #if !defined(TIERED) && !defined(INCLUDE_JVMCI)
    COMPILER1_PRESENT(return false);
  #endif // !TIERED
! #if COMPILER2_OR_JVMCI
    OopMapStream oms(this,OopMapValue::derived_oop_value);
    return oms.is_done();
  #else
    return false;
! #endif // COMPILER2_OR_JVMCI
  }
  
  #endif //PRODUCT
  
  // Printing code is present in product build for -XX:+PrintAssembly.
*** 724,734 ****
  }
  
  
  //------------------------------DerivedPointerTable---------------------------
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
  
  class DerivedPointerEntry : public CHeapObj<mtCompiler> {
   private:
    oop*     _location; // Location of derived pointer (also pointing to the base)
    intptr_t _offset;   // Offset from base pointer
--- 724,734 ----
  }
  
  
  //------------------------------DerivedPointerTable---------------------------
  
! #if COMPILER2_OR_JVMCI
  
  class DerivedPointerEntry : public CHeapObj<mtCompiler> {
   private:
    oop*     _location; // Location of derived pointer (also pointing to the base)
    intptr_t _offset;   // Offset from base pointer
*** 817,822 ****
    }
    _list->clear();
    _active = false;
  }
  
! #endif // COMPILER2 || INCLUDE_JVMCI
--- 817,822 ----
    }
    _list->clear();
    _active = false;
  }
  
! #endif // COMPILER2_OR_JVMCI