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

runtime/vm/object.cc

 // 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.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 4909 matching lines @@
 void PatchClass::set_source_class(const Class& value) const {
   StorePointer(&raw_ptr()->source_class_, value.raw());
 }
 
 
 bool Function::HasBreakpoint() const {
   return Isolate::Current()->debugger()->HasBreakpoint(*this);
 }
 
 
-void Function::set_code(const Code& value) const {
-  StorePointer(&raw_ptr()->code_, value.raw());
+void Function::SetCode(const Code& value) const {
+  StorePointer(&raw_ptr()->instructions_, value.instructions());
 }
 
 void Function::AttachCode(const Code& value) const {
-  set_code(value);
+  SetCode(value);
   ASSERT(Function::Handle(value.function()).IsNull() ||
     (value.function() == this->raw()));
   value.set_owner(*this);
 }
 
 
 bool Function::HasCode() const {
-  ASSERT(raw_ptr()->code_ != Code::null());
-  return raw_ptr()->code_ != StubCode::LazyCompile_entry()->code();
+  ASSERT(raw_ptr()->instructions_ != Instructions::null());
+  return raw_ptr()->instructions_ !=
+      StubCode::LazyCompile_entry()->code()->ptr()->instructions_;
 }
 
 
 void Function::ClearCode() const {
-  StorePointer(&raw_ptr()->code_, StubCode::LazyCompile_entry()->code());
   StorePointer(&raw_ptr()->unoptimized_code_, Code::null());
+  StorePointer(&raw_ptr()->instructions_,
+      Code::Handle(StubCode::LazyCompile_entry()->code()).instructions());
 }
 
 
 void Function::SwitchToUnoptimizedCode() const {
   ASSERT(HasOptimizedCode());
   const Code& current_code = Code::Handle(CurrentCode());
 
   if (FLAG_trace_disabling_optimized_code) {
     OS::Print("Disabling optimized code: '%s' entry: %#" Px "\n",
       ToFullyQualifiedCString(),
@@ skipping 1008 matching lines @@
   result.set_end_token_pos(token_pos);
   result.set_num_fixed_parameters(0);
   result.set_num_optional_parameters(0);
   result.set_usage_counter(0);
   result.set_deoptimization_counter(0);
   result.set_optimized_instruction_count(0);
   result.set_optimized_call_site_count(0);
   result.set_is_optimizable(is_native ? false : true);
   result.set_is_inlinable(true);
   result.set_allows_hoisting_check_class(true);
-  result.set_code(Code::Handle(StubCode::LazyCompile_entry()->code()));
+  result.SetCode(Code::Handle(StubCode::LazyCompile_entry()->code()));
   if (kind == RawFunction::kClosureFunction) {
     const ClosureData& data = ClosureData::Handle(ClosureData::New());
     result.set_data(data);
   }
 
   return result.raw();
 }
 
 
 RawFunction* Function::Clone(const Class& new_owner) const {
@@ skipping 304 matching lines @@
   const Object& obj = Object::Handle(raw_ptr()->owner_);
   if (obj.IsClass()) {
     return Class::Cast(obj).script();
   }
   ASSERT(obj.IsPatchClass());
   return PatchClass::Cast(obj).Script();
 }
 
 
 bool Function::HasOptimizedCode() const {
-  return HasCode() && Code::Handle(raw_ptr()->code_).is_optimized();
+  return HasCode() &&
+      Code::Handle(Instructions::Handle(raw_ptr()->instructions_).code()).

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

I haven't seen many line breaks after . in our code. Maybe break after
Instructions::Handle( ?

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

Done.

+          is_optimized();
 }
 
 
 RawString* Function::PrettyName() const {
   const String& str = String::Handle(name());
   return String::IdentifierPrettyName(str);
 }
 
 
 RawString* Function::UserVisibleName() const {
@@ skipping 12665 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart