< prev index next >

src/hotspot/share/aot/aotCompiledMethod.hpp

Print this page

        

@@ -116,11 +116,10 @@
   const int _metadata_size; // size of _metadata_got
   const int _aot_id;
   const int _method_index;
   oop _oop;  // method()->method_holder()->klass_holder()
 
-  address* orig_pc_addr(const frame* fr);
   bool make_not_entrant_helper(int new_state);
 
  public:
   using CHeapObj<mtCode>::operator new;
   using CHeapObj<mtCode>::operator delete;

@@ -129,11 +128,12 @@
   void set_oop(oop o) { _oop = o; }
 
   AOTCompiledMethod(address code, Method* method, aot_metadata* meta, address metadata_got, int metadata_size, jlong* state_adr, AOTCodeHeap* heap, const char* name, int method_index, int aot_id) :
     CompiledMethod(method, name, compiler_jvmci, // AOT code is generated by JVMCI compiler
         AOTCompiledMethodLayout(code, code + meta->code_size(), (address) meta->relocation_begin(), (address) meta->relocation_end()),
-        0 /* frame_complete_offset */, meta->frame_size() /* frame_size */, meta->oopmap_set(), false /* caller_must_gc_arguments */),
+        0 /* frame_complete_offset */, meta->frame_size() /* frame_size */, meta->oopmap_set(), false /* caller_must_gc_arguments */,
+        method != NULL /* compiled */),
     _code(code),
     _meta(meta),
     _metadata_got((Metadata**) metadata_got),
     _state_adr(state_adr),
     _heap(heap),

@@ -159,12 +159,10 @@
   }
 
   virtual bool is_aot() const { return true; }
   virtual bool is_runtime_stub() const { return is_aot_runtime_stub(); }
 
-  virtual bool is_compiled() const     { return !is_aot_runtime_stub(); }
-
   virtual bool is_locked_by_vm() const { return false; }
 
   int state() const { return *_state_adr; }
 
   // Non-virtual for speed

@@ -234,16 +232,14 @@
   virtual address stub_end() const { return code_end(); }
 
   virtual oop* oop_addr_at(int index) const { ShouldNotReachHere(); return NULL; }
   virtual Metadata** metadata_addr_at(int index) const { ShouldNotReachHere(); return NULL; }
 
-  // Accessor/mutator for the original pc of a frame before a frame was deopted.
-  address get_original_pc(const frame* fr) { return *orig_pc_addr(fr); }
-  void    set_original_pc(const frame* fr, address pc) { *orig_pc_addr(fr) = pc; }
-
   virtual void metadata_do(MetadataClosure* f);
 
+  int orig_pc_offset() { return _meta->orig_pc_offset(); }
+  
   bool metadata_got_contains(Metadata **p) {
     return p >= &_metadata_got[0] && p < &_metadata_got[_metadata_size];
   }
 
   Metadata** metadata_begin() const { return &_metadata_got[0] ; }
< prev index next >