src/hotspot/share/asm/codeBuffer.hpp

*** 432,10 ***
--- 432,13 ---
  
    bool is_empty() const;
  
    void share(const AsmRemarks &src);
    void clear();
+   // Clear Collection refence when storing AOT code,
+   // new one will be created during AOT code load.
+   void clear_ref() { _remarks = nullptr; }
    uint print(uint offset, outputStream* strm = tty) const;
  
    // For testing purposes only.
    const AsmRemarkCollection* ref() const { return _remarks; }
  

*** 460,10 ***
--- 463,13 ---
  
    bool is_empty() const;
  
    void share(const DbgStrings &src);
    void clear();
+   // Clear Collection refence when storing AOT code,
+   // new one will be created during AOT code load.
+   void clear_ref() { _strings = nullptr; }
  
    // For testing purposes only.
    const DbgStringCollection* ref() const { return _strings; }
  
    template<typename Function>