- Consolidate code into the old generation.

vm/heap.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_HEAP_H_
 #define VM_HEAP_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/flags.h"
@@ skipping 42 matching lines @@
   static const intptr_t kCodeHeapSizeInMB = 18;
 
   ~Heap();
 
   uword Allocate(intptr_t size, Space space) {
     ASSERT(!read_only_);
     switch (space) {
       case kNew:
         // Do not attempt to allocate very large objects in new space.
         if (!PageSpace::IsPageAllocatableSize(size)) {
-          return AllocateOld(size);
+          return AllocateOld(size, HeapPage::kData);
         }
         return AllocateNew(size);
       case kOld:
-        return AllocateOld(size);
+        return AllocateOld(size, HeapPage::kData);
       case kCode:
-        return AllocateCode(code_space_, size);
+        return AllocateOld(size, HeapPage::kExecutable);
       default:
         UNREACHABLE();
     }
     return 0;
   }
 
   uword TryAllocate(intptr_t size, Space space) {
     ASSERT(!read_only_);
     switch (space) {
       case kNew:
         return new_space_->TryAllocate(size);
       case kOld:
-        return old_space_->TryAllocate(size);
+        return old_space_->TryAllocate(size, HeapPage::kData);
       case kCode:
-        return code_space_->TryAllocate(size);
+        return old_space_->TryAllocate(size, HeapPage::kExecutable);
       default:
         UNREACHABLE();
     }
     return 0;
   }
 
   // Heap contains the specified address.
   bool Contains(uword addr) const;
   bool NewContains(uword addr) const;
   bool OldContains(uword addr) const;
   bool CodeContains(uword addr) const;
   bool StubCodeContains(uword addr) const;
 
   // Visit all pointers.
   void IteratePointers(ObjectPointerVisitor* visitor);
 
   // Visit all pointers in the space.
   void IterateNewPointers(ObjectPointerVisitor* visitor);
   void IterateOldPointers(ObjectPointerVisitor* visitor);
-  void IterateCodePointers(ObjectPointerVisitor* visitor);
 
   // Visit all objects.
   void IterateObjects(ObjectVisitor* visitor);
 
   // Visit all object in the space.
   void IterateNewObjects(ObjectVisitor* visitor);
   void IterateOldObjects(ObjectVisitor* visitor);
-  void IterateCodeObjects(ObjectVisitor* visitor);
 
   // Find an object by visiting all pointers in the specified heap space,
   // the 'visitor' is used to determine if an object is found or not.
   // The 'visitor' function should be set up to return true if the
   // object is found, traversal through the heap space stops at that
   // point.
   // The 'visitor' function should return false if the object is not found,
   // traversal through the heap space continues.
-  RawInstructions* FindObjectInCodeSpace(FindObjectVisitor* visitor);
+  RawInstructions* FindObjectInOldSpace(FindObjectVisitor* visitor);
   RawInstructions* FindObjectInStubCodeSpace(FindObjectVisitor* visitor);
 
   void CollectGarbage(Space space);
   void CollectGarbage(Space space, ApiCallbacks api_callbacks);
   void CollectAllGarbage();
 
   // Enables growth control on the page space heaps.  This should be
   // called before any user code is executed.
   void EnableGrowthControl();
 
@@ skipping 32 matching lines @@
   // there is no association.
   void* GetPeer(RawObject* raw_obj);
 
   // Returns the number of objects with a peer.
   int64_t PeerCount() const;
 
  private:
   Heap();
 
   uword AllocateNew(intptr_t size);
-  uword AllocateOld(intptr_t size);
-  uword AllocateCode(PageSpace* space, intptr_t size);
+  uword AllocateOld(intptr_t size, HeapPage::PageType type);
 
   // The different spaces used for allocation.
   Scavenger* new_space_;
   PageSpace* old_space_;
-  PageSpace* code_space_;
 
   // This heap is in read-only mode: No allocation is allowed.
   bool read_only_;
 
   friend class GCTestHelper;
   DISALLOW_COPY_AND_ASSIGN(Heap);
 };
 
 
 #if defined(DEBUG)
 class NoGCScope : public StackResource {
  public:
   NoGCScope();
   ~NoGCScope();
  private:
   DISALLOW_COPY_AND_ASSIGN(NoGCScope);
 };
 #else  // defined(DEBUG)
 class NoGCScope : public ValueObject {
  public:
   NoGCScope() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(NoGCScope);
 };
 #endif  // defined(DEBUG)
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_