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

runtime/vm/raw_object.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 594 matching lines @@
   static bool SkipCode(RawFunction* raw_fun);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   RawString* name_;
   RawObject* owner_;  // Class or patch class or mixin class
                       // where this function is defined.
   RawAbstractType* result_type_;
   RawArray* parameter_types_;
   RawArray* parameter_names_;
   RawObject* data_;  // Additional data specific to the function kind.
-  RawCode* code_;  // Compiled code for the function.
+  RawInstructions* instructions_;  // Instructions of currently active code.
   RawCode* unoptimized_code_;  // Unoptimized code, keep it after optimization.
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->unoptimized_code_);
   }
   RawObject** to_no_code() {
     return reinterpret_cast<RawObject**>(&ptr()->data_);
   }
 
   intptr_t token_pos_;
   intptr_t end_token_pos_;
@@ skipping 211 matching lines @@
   intptr_t pointer_offsets_length_;
   // Alive: If true, the embedded object pointers will be visited during GC.
   // This field cannot be shorter because of alignment issues on x64
   // architectures.
   intptr_t state_bits_;  // state, is_optimized, is_alive.
 
   // Variable length data follows here.
   int32_t data_[0];
 
   friend class StackFrame;
+  friend class MarkingVisitor;
+  friend class Function;
 };
 
 
 class RawInstructions : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Instructions);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->code_);
   }
   RawCode* code_;
   RawArray* object_pool_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->object_pool_);
   }
   intptr_t size_;
 
   // Variable length data follows here.
   uint8_t data_[0];
 
   // Private helper function used while visiting stack frames. The
   // code which iterates over dart frames is also called during GC and
   // is not allowed to create handles.
   static bool ContainsPC(RawObject* raw_obj, uword pc);
 
   friend class RawCode;
   friend class Code;
   friend class StackFrame;
+  friend class MarkingVisitor;
+  friend class Function;
 };
 
 
 class RawPcDescriptors : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(PcDescriptors);
 
   intptr_t length_;  // Number of descriptors.
 
   // Variable length data follows here.
   intptr_t data_[0];
@@ skipping 961 matching lines @@
   COMPILE_ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 14);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_