Cleaning up HAllocate space and double alignment selection.

src/heap.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 464 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ExternalStringTable);
 };
 
 
 enum ArrayStorageAllocationMode {
   DONT_INITIALIZE_ARRAY_ELEMENTS,
   INITIALIZE_ARRAY_ELEMENTS_WITH_HOLE
 };
 
+
+enum AllocationMode { NEW_SPACE_ALLOCATION, OLD_SPACE_ALLOCATION };

[Michael Starzinger, 2013/07/31 16:43:16]

Why not use the existing PretenureFlag instead?

[Hannes Payer (out of office), 2013/08/01 07:30:57]

Done.

+
+
 class Heap {
  public:
   // Configure heap size before setup. Return false if the heap has been
   // set up already.
   bool ConfigureHeap(int max_semispace_size,
                      intptr_t max_old_gen_size,
                      intptr_t max_executable_size);
   bool ConfigureHeapDefault();
 
   // Prepares the heap, setting up memory areas that are needed in the isolate
@@ skipping 896 matching lines @@
   bool Contains(Address addr);
   bool Contains(HeapObject* value);
 
   // Checks whether an address/object in a space.
   // Currently used by tests, serialization and heap verification only.
   bool InSpace(Address addr, AllocationSpace space);
   bool InSpace(HeapObject* value, AllocationSpace space);
 
   // Finds out which space an object should get promoted to based on its type.
   inline OldSpace* TargetSpace(HeapObject* object);
-  inline AllocationSpace TargetSpaceId(InstanceType type);
+  static inline AllocationSpace TargetSpaceId(InstanceType type);
 
   // Sets the stub_cache_ (only used when expanding the dictionary).
   void public_set_code_stubs(UnseededNumberDictionary* value) {
     roots_[kCodeStubsRootIndex] = value;
   }
 
   // Support for computing object sizes for old objects during GCs. Returns
   // a function that is guaranteed to be safe for computing object sizes in
   // the current GC phase.
   HeapObjectCallback GcSafeSizeOfOldObjectFunction() {
@@ skipping 126 matching lines @@
   // Adjusts the amount of registered external memory.
   // Returns the adjusted value.
   inline intptr_t AdjustAmountOfExternalAllocatedMemory(
       intptr_t change_in_bytes);
 
   // Allocate uninitialized fixed array.
   MUST_USE_RESULT MaybeObject* AllocateRawFixedArray(int length);
   MUST_USE_RESULT MaybeObject* AllocateRawFixedArray(int length,
                                                      PretenureFlag pretenure);
 
-  // Predicate that governs global pre-tenuring decisions based on observed
-  // promotion rates of previous collections.
-  inline bool ShouldGloballyPretenure() {
-    return FLAG_pretenuring && new_space_high_promotion_mode_active_;
+  // Returns the allocation mode (pre-tenuring) based on observed promotion
+  // rates of previous collections.
+  inline AllocationMode GetAllocationMode() {

[Michael Starzinger, 2013/07/31 16:43:16]

suggestion: s/GetAllocationMode/GetGlobalPretenure[Mode,Flag]/

[Hannes Payer (out of office), 2013/08/01 07:30:57]

Done.

+    return FLAG_pretenuring && new_space_high_promotion_mode_active_ ?
+        OLD_SPACE_ALLOCATION : NEW_SPACE_ALLOCATION;
   }
 
   // This is only needed for testing high promotion mode.
   void SetNewSpaceHighPromotionModeActive(bool mode) {
     new_space_high_promotion_mode_active_ = mode;
   }
 
   inline PretenureFlag GetPretenureMode() {
     return new_space_high_promotion_mode_active_ ? TENURED : NOT_TENURED;
   }
@@ skipping 1488 matching lines @@
   DisallowHeapAllocation no_allocation;  // i.e. no gc allowed.
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(PathTracer);
 };
 #endif  // DEBUG
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_H_