Allow direct allocation in old pointer space.

src/ia32/lithium-codegen-ia32.cc

 // 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 5405 matching lines @@
   Handle<Map> initial_map(constructor->initial_map());
   int instance_size = initial_map->instance_size();
   ASSERT(initial_map->pre_allocated_property_fields() +
          initial_map->unused_property_fields() -
          initial_map->inobject_properties() == 0);
 
   // Allocate memory for the object.  The initial map might change when
   // the constructor's prototype changes, but instance size and property
   // counts remain unchanged (if slack tracking finished).
   ASSERT(!constructor->shared()->IsInobjectSlackTrackingInProgress());
-  __ AllocateInNewSpace(instance_size,
-                        result,
-                        no_reg,
-                        scratch,
-                        deferred->entry(),
-                        TAG_OBJECT);
+  __ Allocate(instance_size, result, no_reg, scratch, deferred->entry(),
+              TAG_OBJECT, MacroAssembler::NEW_SPACE);
 
   __ bind(deferred->exit());
   if (FLAG_debug_code) {
     Label is_in_new_space;
     __ JumpIfInNewSpace(result, scratch, &is_in_new_space);
     __ Abort("Allocated object is not in new-space");
     __ bind(&is_in_new_space);
   }
 
   // Load the initial map.
@@ skipping 69 matching lines @@
   Register result = ToRegister(instr->result());
   Register temp = ToRegister(instr->temp());
 
   // Allocate memory for the object.
   AllocationFlags flags = TAG_OBJECT;
   if (instr->hydrogen()->MustAllocateDoubleAligned()) {
     flags = static_cast<AllocationFlags>(flags | DOUBLE_ALIGNMENT);
   }
   if (instr->size()->IsConstantOperand()) {
     int32_t size = ToInteger32(LConstantOperand::cast(instr->size()));
-    __ AllocateInNewSpace(size, result, temp, no_reg, deferred->entry(), flags);
+    if (instr->hydrogen()->CanAllocateInOldPointerSpace()) {
+      __ Allocate(size, result, temp, no_reg, deferred->entry(), flags,
+                  MacroAssembler::OLD_POINTER_SPACE);

[mvstanton, 2013/03/05 09:35:57]

Maybe it's nice to have a variable for the space to allocate in, setting it via
ternary operator like
Space space = instr->hydrogen()->CanAllocateInOldPointerSpace()
    ? MacroAssembler::OLD_POINTER_SPACE
    : MacroAssembler::NEW_SPACE;

then you just need one __ Allocate() call.

[danno, 2013/03/05 12:18:18]

+1
On 2013/03/05 09:35:57, mvstanton wrote:

[Hannes Payer (out of office), 2013/03/11 17:16:31]

after re-factoring not needed anymore.

[Hannes Payer (out of office), 2013/03/11 17:16:31]

Done.

+    } else {
+      __ Allocate(size, result, temp, no_reg, deferred->entry(), flags,
+                  MacroAssembler::NEW_SPACE);
+    }
   } else {
     Register size = ToRegister(instr->size());
     __ AllocateInNewSpace(size, result, temp, no_reg, deferred->entry(), flags);
   }
 
   __ bind(deferred->exit());
 }
 
 
 void LCodeGen::DoDeferredAllocate(LAllocate* instr) {
@@ skipping 218 matching lines @@
     __ mov(ecx, FieldOperand(ecx, Map::kBitField2Offset));
     // Retrieve elements_kind from bit field 2.
     __ and_(ecx, Map::kElementsKindMask);
     __ cmp(ecx, boilerplate_elements_kind << Map::kElementsKindShift);
     DeoptimizeIf(not_equal, instr->environment());
   }
 
   // Allocate all objects that are part of the literal in one big
   // allocation. This avoids multiple limit checks.
   Label allocated, runtime_allocate;
-  __ AllocateInNewSpace(size, eax, ecx, edx, &runtime_allocate, TAG_OBJECT);
+  __ Allocate(size, eax, ecx, edx, &runtime_allocate, TAG_OBJECT,
+              MacroAssembler::NEW_SPACE);
   __ jmp(&allocated);
 
   __ bind(&runtime_allocate);
   __ push(Immediate(Smi::FromInt(size)));
   CallRuntime(Runtime::kAllocateInNewSpace, 1, instr);
 
   __ bind(&allocated);
   int offset = 0;
   __ LoadHeapObject(ebx, instr->hydrogen()->boilerplate());
   EmitDeepCopy(instr->hydrogen()->boilerplate(), eax, ebx, &offset,
@@ skipping 69 matching lines @@
   __ push(ecx);
   __ push(Immediate(Smi::FromInt(instr->hydrogen()->literal_index())));
   __ push(Immediate(instr->hydrogen()->pattern()));
   __ push(Immediate(instr->hydrogen()->flags()));
   CallRuntime(Runtime::kMaterializeRegExpLiteral, 4, instr);
   __ mov(ebx, eax);
 
   __ bind(&materialized);
   int size = JSRegExp::kSize + JSRegExp::kInObjectFieldCount * kPointerSize;
   Label allocated, runtime_allocate;
-  __ AllocateInNewSpace(size, eax, ecx, edx, &runtime_allocate, TAG_OBJECT);
+  __ Allocate(size, eax, ecx, edx, &runtime_allocate, TAG_OBJECT,
+              MacroAssembler::NEW_SPACE);
   __ jmp(&allocated);
 
   __ bind(&runtime_allocate);
   __ push(ebx);
   __ push(Immediate(Smi::FromInt(size)));
   CallRuntime(Runtime::kAllocateInNewSpace, 1, instr);
   __ pop(ebx);
 
   __ bind(&allocated);
   // Copy the content into the newly allocated memory.
@@ skipping 382 matching lines @@
                               FixedArray::kHeaderSize - kPointerSize));
   __ bind(&done);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32