Version 1.5.0-dev.4.5

dart/runtime/vm/object.h

Index: dart/runtime/vm/object.h
===================================================================
--- dart/runtime/vm/object.h	(revision 37109)
+++ dart/runtime/vm/object.h	(working copy)
@@ -2970,9 +2970,6 @@
  public:
   enum Kind {
     kDeopt,            // Deoptimization continuation point.
-    kEntryPatch,       // Location where to patch entry.
-    kPatchCode,        // Buffer for patching code entry.
-    kLazyDeoptJump,    // Lazy deoptimization trampoline.
     kIcCall,           // IC call.
     kOptStaticCall,    // Call directly to known target, e.g. static call.
     kUnoptStaticCall,  // Call to a known target via a stub.
@@ -3631,7 +3628,6 @@
   static const intptr_t kMaxElements = kSmiMax / kBytesPerElement;
 
   static intptr_t InstanceSize() {
-    ASSERT(sizeof(RawCode) == OFFSET_OF(RawCode, data_));
     return 0;
   }
   static intptr_t InstanceSize(intptr_t len) {
@@ -3653,10 +3649,17 @@
   }
   intptr_t GetTokenIndexOfPC(uword pc) const;
 
-  // Find pc, return 0 if not found.
+  enum {
+    kInvalidPc = -1
+  };
+
+  // Returns 0 if code is not patchable
+  uword GetEntryPatchPc() const;
   uword GetPatchCodePc() const;
+
   uword GetLazyDeoptPc() const;
 
+  // Find pc, return 0 if not found.
   uword GetPcForDeoptId(intptr_t deopt_id, PcDescriptors::Kind kind) const;
   intptr_t GetDeoptIdForOsr(uword pc) const;
 
@@ -3680,6 +3683,29 @@
     return raw_ptr()->compile_timestamp_;
   }
 
+  intptr_t entry_patch_pc_offset() const {
+    return raw_ptr()->entry_patch_pc_offset_;
+  }
+  void set_entry_patch_pc_offset(intptr_t pc) const {
+    raw_ptr()->entry_patch_pc_offset_ = pc;
+  }
+
+
+  intptr_t patch_code_pc_offset() const {
+    return raw_ptr()->patch_code_pc_offset_;
+  }
+  void set_patch_code_pc_offset(intptr_t pc) const {
+    raw_ptr()->patch_code_pc_offset_ = pc;
+  }
+
+
+  intptr_t lazy_deopt_pc_offset() const {
+    return raw_ptr()->lazy_deopt_pc_offset_;
+  }
+  void set_lazy_deopt_pc_offset(intptr_t pc) const {
+    raw_ptr()->lazy_deopt_pc_offset_ = pc;
+  }
+
  private:
   void set_state_bits(intptr_t bits) const;