- Consolidate code into the old generation.

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/bigint_operations.h"
@@ skipping 6367 matching lines @@
     // This should be caught before we reach here.
     FATAL1("Fatal error in Instructions::New: invalid size %"Pd"\n", size);
   }
   Instructions& result = Instructions::Handle();
   {
     uword aligned_size = Instructions::InstanceSize(size);
     RawObject* raw = Object::Allocate(Instructions::kClassId,
                                       aligned_size,
                                       Heap::kCode);
     NoGCScope no_gc;
-    // TODO(iposva): Remove premarking once old and code spaces are merged.
-    raw->SetMarkBit();
     result ^= raw;
     result.set_size(size);
   }
   return result.raw();
 }
 
 
 const char* Instructions::ToCString() const {
   return "Instructions";
 }
@@ skipping 560 matching lines @@
 void Code::set_deopt_info_array(const Array& array) const {
   StorePointer(&raw_ptr()->deopt_info_array_, array.raw());
 }
 
 
 void Code::set_object_table(const Array& array) const {
   StorePointer(&raw_ptr()->object_table_, array.raw());
 }
 
 
+void Code::set_resolved_static_calls(const GrowableObjectArray& val) const {
+  StorePointer(&raw_ptr()->resolved_static_calls_, val.raw());
+}
+
+
 const Code::Comments& Code::comments() const  {
   Comments* comments = new Code::Comments(raw_ptr()->comments_);
   return *comments;
 }
 
 
 void Code::set_comments(const Code::Comments& comments) const {
   StorePointer(&raw_ptr()->comments_, comments.comments_.raw());
 }
 
@@ skipping 121 matching lines @@
 bool Code::FindRawCodeVisitor::FindObject(RawObject* obj) {
   return RawInstructions::ContainsPC(obj, pc_);
 }
 
 
 RawCode* Code::LookupCode(uword pc) {
   Isolate* isolate = Isolate::Current();
   NoGCScope no_gc;
   FindRawCodeVisitor visitor(pc);
   RawInstructions* instr;
-  instr = isolate->heap()->FindObjectInCodeSpace(&visitor);
+  instr = isolate->heap()->FindObjectInOldSpace(&visitor);
   if (instr != Instructions::null()) {
     return instr->ptr()->code_;
   }
   return Code::null();
 }
 
 
 intptr_t Code::GetTokenIndexOfPC(uword pc) const {
   intptr_t token_pos = -1;
   const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
@@ skipping 5102 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart