src/share/vm/code/codeBlob.hpp

*** 39,49 ****
      MethodNonProfiled   = 0,    // Execution level 1 and 4 (non-profiled) nmethods (including native nmethods)
      MethodProfiled      = 1,    // Execution level 2 and 3 (profiled) nmethods
      NonNMethod          = 2,    // Non-nmethods like Buffers, Adapters and Runtime Stubs
      All                 = 3,    // All types (No code cache segmentation)
      Pregenerated        = 4,    // Special blobs, managed by CodeCacheExtensions
!     NumTypes            = 5     // Number of CodeBlobTypes
    };
  };
  
  // CodeBlob - superclass for all entries in the CodeCache.
  //
--- 39,50 ----
      MethodNonProfiled   = 0,    // Execution level 1 and 4 (non-profiled) nmethods (including native nmethods)
      MethodProfiled      = 1,    // Execution level 2 and 3 (profiled) nmethods
      NonNMethod          = 2,    // Non-nmethods like Buffers, Adapters and Runtime Stubs
      All                 = 3,    // All types (No code cache segmentation)
      Pregenerated        = 4,    // Special blobs, managed by CodeCacheExtensions
!     AOT                 = 5,    // AOT methods
!     NumTypes            = 6     // Number of CodeBlobTypes
    };
  };
  
  // CodeBlob - superclass for all entries in the CodeCache.
  //
*** 116,125 ****
--- 117,127 ----
    virtual bool is_uncommon_trap_stub() const          { return false; }
    virtual bool is_exception_stub() const              { return false; }
    virtual bool is_safepoint_stub() const              { return false; }
    virtual bool is_adapter_blob() const                { return false; }
    virtual bool is_method_handles_adapter_blob() const { return false; }
+   virtual bool is_aot() const                         { return false; }
    virtual bool is_compiled() const                    { return false; }
  
    inline bool is_compiled_by_c1() const    { return _type == compiler_c1; };
    inline bool is_compiled_by_c2() const    { return _type == compiler_c2; };
    inline bool is_compiled_by_jvmci() const { return _type == compiler_jvmci; };
*** 129,138 ****
--- 131,141 ----
    // Casting
    nmethod* as_nmethod_or_null()                { return is_nmethod() ? (nmethod*) this : NULL; }
    nmethod* as_nmethod()                        { assert(is_nmethod(), "must be nmethod"); return (nmethod*) this; }
    CompiledMethod* as_compiled_method_or_null() { return is_compiled() ? (CompiledMethod*) this : NULL; }
    CompiledMethod* as_compiled_method()         { assert(is_compiled(), "must be compiled"); return (CompiledMethod*) this; }
+   CodeBlob* as_codeblob_or_null() const        { return (CodeBlob*) this; }
  
    // Boundaries
    address header_begin() const        { return (address) this; }
    relocInfo* relocation_begin() const { return (relocInfo*) _relocation_begin; };
    relocInfo* relocation_end() const   { return (relocInfo*) _relocation_end; }
*** 203,212 ****
--- 206,216 ----
      _strings.print_block_comment(stream, offset);
    }
  
    // Transfer ownership of comments to this CodeBlob
    void set_strings(CodeStrings& strings) {
+     assert(!is_aot(), "invalid on aot");
      _strings.assign(strings);
    }
  
    static ByteSize name_field_offset() {
      return byte_offset_of(CodeBlob, _name);