Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index 941bb32affdfcc7dd5b0fc87829bf46d8429eb81..04a3b8ed99d6c35bac56995220d5b8722a691ed2 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -5763,9 +5763,9 @@ static void CreateArrayDispatchOneArgument(MacroAssembler* masm, |
} |
// Save the resulting elements kind in type info |
- __ SmiTag(edx); |
- __ mov(FieldOperand(ecx, AllocationSite::kTransitionInfoOffset), edx); |
- __ SmiUntag(edx); |
+ STATIC_ASSERT(AllocationSite::ElementsKindBits::kShift == 0); |
+ __ add(FieldOperand(ecx, AllocationSite::kTransitionInfoOffset), |
+ Immediate(Smi::FromInt(kFastElementsKindPackedToHoley))); |
__ bind(&normal_sequence); |
int last_index = GetSequenceIndexFromFastElementsKind( |
@@ -5906,8 +5906,11 @@ void ArrayConstructorStub::Generate(MacroAssembler* masm) { |
masm->isolate()->factory()->allocation_site_map())); |
__ j(not_equal, &no_info); |
+ // Only look at the lower 16 bits of the transition info. |
__ mov(edx, FieldOperand(edx, AllocationSite::kTransitionInfoOffset)); |
__ SmiUntag(edx); |
+ STATIC_ASSERT(AllocationSite::ElementsKindBits::kShift == 0); |
+ __ and_(edx, Immediate(AllocationSite::ElementsKindBits::kMask)); |
GenerateDispatchToArrayStub(masm, DONT_OVERRIDE); |
__ bind(&no_info); |