| Index: src/arm/full-codegen-arm.cc
|
| diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
|
| index 1cb0e7b13284cc8fa186977e443f80660ede96e3..ee06bbea7704af490a5fb45d708613f7ea0fa17a 100644
|
| --- a/src/arm/full-codegen-arm.cc
|
| +++ b/src/arm/full-codegen-arm.cc
|
| @@ -2543,11 +2543,75 @@ void FullCodeGenerator::EmitIsStringWrapperSafeForDefaultValueOf(
|
| context()->PrepareTest(&materialize_true, &materialize_false,
|
| &if_true, &if_false, &fall_through);
|
|
|
| - // Just indicate false, as %_IsStringWrapperSafeForDefaultValueOf() is only
|
| - // used in a few functions in runtime.js which should not normally be hit by
|
| - // this compiler.
|
| + if (FLAG_debug_code) __ AbortIfSmi(r0);
|
| +
|
| + __ ldr(r1, FieldMemOperand(r0, HeapObject::kMapOffset));
|
| + __ ldrb(ip, FieldMemOperand(r1, Map::kBitField2Offset));
|
| + __ tst(ip, Operand(1 << Map::kStringWrapperSafeForDefaultValueOf));
|
| + __ b(ne, if_true);
|
| +
|
| + // Check for fast case object. Generate false result for slow case object.
|
| + __ ldr(r2, FieldMemOperand(r0, JSObject::kPropertiesOffset));
|
| + __ ldr(r2, FieldMemOperand(r2, HeapObject::kMapOffset));
|
| + __ LoadRoot(ip, Heap::kHashTableMapRootIndex);
|
| + __ cmp(r2, ip);
|
| + __ b(eq, if_false);
|
| +
|
| + // Look for valueOf symbol in the descriptor array, and indicate false if
|
| + // found. The type is not checked, so if it is a transition it is a false
|
| + // negative.
|
| + __ ldr(r4, FieldMemOperand(r1, Map::kInstanceDescriptorsOffset));
|
| + __ ldr(r3, FieldMemOperand(r4, FixedArray::kLengthOffset));
|
| + // r4: descriptor array
|
| + // r3: length of descriptor array
|
| + // Calculate the end of the descriptor array.
|
| + STATIC_ASSERT(kSmiTag == 0);
|
| + STATIC_ASSERT(kSmiTagSize == 1);
|
| + STATIC_ASSERT(kPointerSize == 4);
|
| + __ add(r2, r4, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
|
| + __ add(r2, r2, Operand(r3, LSL, kPointerSizeLog2 - kSmiTagSize));
|
| +
|
| + // Calculate location of the first key name.
|
| + __ add(r4,
|
| + r4,
|
| + Operand(FixedArray::kHeaderSize - kHeapObjectTag +
|
| + DescriptorArray::kFirstIndex * kPointerSize));
|
| + // Loop through all the keys in the descriptor array. If one of these is the
|
| + // symbol valueOf the result is false.
|
| + Label entry, loop;
|
| + // The use of ip to store the valueOf symbol asumes that it is not otherwise
|
| + // used in the loop below.
|
| + __ mov(ip, Operand(FACTORY->value_of_symbol()));
|
| + __ jmp(&entry);
|
| + __ bind(&loop);
|
| + __ ldr(r3, MemOperand(r4, 0));
|
| + __ cmp(r3, ip);
|
| + __ b(eq, if_false);
|
| + __ add(r4, r4, Operand(kPointerSize));
|
| + __ bind(&entry);
|
| + __ cmp(r4, Operand(r2));
|
| + __ b(ne, &loop);
|
| +
|
| + // If a valueOf property is not found on the object check that it's
|
| + // prototype is the un-modified String prototype. If not result is false.
|
| + __ ldr(r2, FieldMemOperand(r1, Map::kPrototypeOffset));
|
| + __ tst(r2, Operand(kSmiTagMask));
|
| + __ b(eq, if_false);
|
| + __ ldr(r2, FieldMemOperand(r2, HeapObject::kMapOffset));
|
| + __ ldr(r3, ContextOperand(cp, Context::GLOBAL_INDEX));
|
| + __ ldr(r3, FieldMemOperand(r3, GlobalObject::kGlobalContextOffset));
|
| + __ ldr(r3, ContextOperand(r3, Context::STRING_FUNCTION_PROTOTYPE_MAP_INDEX));
|
| + __ cmp(r2, r3);
|
| + __ b(ne, if_false);
|
| +
|
| + // Set the bit in the map to indicate that it has been checked safe for
|
| + // default valueOf and set true result.
|
| + __ ldrb(r2, FieldMemOperand(r4, Map::kBitField2Offset));
|
| + __ orr(r2, r2, Operand(1 << Map::kStringWrapperSafeForDefaultValueOf));
|
| + __ strb(r2, FieldMemOperand(r4, Map::kBitField2Offset));
|
| + __ jmp(if_true);
|
| +
|
| PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);
|
| - __ jmp(if_false);
|
| context()->Plug(if_true, if_false);
|
| }
|
|
|
|
|