src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp

*** 26,22 ***
  #define CPU_PPC_SMALLREGISTERMAP_PPC_INLINE_HPP
  
  #include "runtime/frame.inline.hpp"
  #include "runtime/registerMap.hpp"
  
  // Java frames don't have callee saved registers, so we can use a smaller RegisterMap
! class SmallRegisterMap {
!   constexpr SmallRegisterMap() = default;
!   ~SmallRegisterMap() = default;
!   NONCOPYABLE(SmallRegisterMap);
! 
! public:
!   static const SmallRegisterMap* instance() {
-     static constexpr SmallRegisterMap the_instance{};
-     return &the_instance;
-   }
  
    // as_RegisterMap is used when we didn't want to templatize and abstract over RegisterMap type to support SmallRegisterMap
    // Consider enhancing SmallRegisterMap to support those cases
    const RegisterMap* as_RegisterMap() const { return nullptr; }
    RegisterMap* as_RegisterMap() { return nullptr; }
  
--- 26,22 ---
  #define CPU_PPC_SMALLREGISTERMAP_PPC_INLINE_HPP
  
  #include "runtime/frame.inline.hpp"
  #include "runtime/registerMap.hpp"
  
+ class SmallRegisterMap;
+ 
  // Java frames don't have callee saved registers, so we can use a smaller RegisterMap
! template <bool IncludeArgs>
! class SmallRegisterMapType {
!   friend SmallRegisterMap;
! 
!   constexpr SmallRegisterMapType() = default;
!   ~SmallRegisterMapType() = default;
!   NONCOPYABLE(SmallRegisterMapType);
  
+  public:
    // as_RegisterMap is used when we didn't want to templatize and abstract over RegisterMap type to support SmallRegisterMap
    // Consider enhancing SmallRegisterMap to support those cases
    const RegisterMap* as_RegisterMap() const { return nullptr; }
    RegisterMap* as_RegisterMap() { return nullptr; }