In class Function replace current code field with current instruction field, that way we save one l…

runtime/vm/object.h

Index: runtime/vm/object.h
===================================================================
--- runtime/vm/object.h	(revision 36916)
+++ runtime/vm/object.h	(working copy)
@@ -1576,7 +1576,7 @@
 
   // Sets function's code and code's function.
   void AttachCode(const Code& value) const;
-  void set_code(const Code& value) const;
+  void SetCode(const Code& value) const;

[zra, 2014/06/03 21:05:23]

maybe SetInstructions?

[srdjan, 2014/06/03 21:28:34]

Done.

   void ClearCode() const;
 
   // Disables optimized code and switches to unoptimized code.
@@ -1584,16 +1584,21 @@
 
   // Return the most recently compiled and installed code for this function.
   // It is not the only Code object that points to this function.
-  RawCode* CurrentCode() const { return raw_ptr()->code_; }
+  RawCode* CurrentCode() const {
+    return raw_ptr()->instructions_->ptr()->code_;
+  }
 
   RawCode* unoptimized_code() const { return raw_ptr()->unoptimized_code_; }
   void set_unoptimized_code(const Code& value) const;
-  static intptr_t code_offset() { return OFFSET_OF(RawFunction, code_); }
   static intptr_t unoptimized_code_offset() {
     return OFFSET_OF(RawFunction, unoptimized_code_);
   }
   bool HasCode() const;
 
+  static intptr_t instructions_offset() {
+    return OFFSET_OF(RawFunction, instructions_);
+  }
+
   // Returns true if there is at least one debugger breakpoint
   // set in this function.
   bool HasBreakpoint() const;