Index: src/arm/full-codegen-arm.cc |
=================================================================== |
--- src/arm/full-codegen-arm.cc (revision 6703) |
+++ src/arm/full-codegen-arm.cc (working copy) |
@@ -268,15 +268,10 @@ |
} |
#ifdef DEBUG |
- // Check that the size of the code used for returning matches what is |
- // expected by the debugger. If the sp_delts above cannot be encoded in the |
- // add instruction the add will generate two instructions. |
- int return_sequence_length = |
- masm_->InstructionsGeneratedSince(&check_exit_codesize); |
- CHECK(return_sequence_length == |
- Assembler::kJSReturnSequenceInstructions || |
- return_sequence_length == |
- Assembler::kJSReturnSequenceInstructions + 1); |
+ // Check that the size of the code used for returning is large enough |
+ // for the debugger's requirements. |
+ ASSERT(Assembler::kJSReturnSequenceInstructions <= |
+ masm_->InstructionsGeneratedSince(&check_exit_codesize)); |
#endif |
} |
} |
@@ -681,18 +676,24 @@ |
} else if (prop != NULL) { |
if (function != NULL || mode == Variable::CONST) { |
// We are declaring a function or constant that rewrites to a |
- // property. Use (keyed) IC to set the initial value. |
- VisitForStackValue(prop->obj()); |
+ // property. Use (keyed) IC to set the initial value. We |
+ // cannot visit the rewrite because it's shared and we risk |
+ // recording duplicate AST IDs for bailouts from optimized code. |
+ ASSERT(prop->obj()->AsVariableProxy() != NULL); |
+ { AccumulatorValueContext for_object(this); |
+ EmitVariableLoad(prop->obj()->AsVariableProxy()->var()); |
+ } |
if (function != NULL) { |
- VisitForStackValue(prop->key()); |
+ __ push(r0); |
VisitForAccumulatorValue(function); |
- __ pop(r1); // Key. |
+ __ pop(r2); |
} else { |
- VisitForAccumulatorValue(prop->key()); |
- __ mov(r1, result_register()); // Key. |
- __ LoadRoot(result_register(), Heap::kTheHoleValueRootIndex); |
+ __ mov(r2, r0); |
+ __ LoadRoot(r0, Heap::kTheHoleValueRootIndex); |
} |
- __ pop(r2); // Receiver. |
+ ASSERT(prop->key()->AsLiteral() != NULL && |
+ prop->key()->AsLiteral()->handle()->IsSmi()); |
+ __ mov(r1, Operand(prop->key()->AsLiteral()->handle())); |
Handle<Code> ic(Builtins::builtin(Builtins::KeyedStoreIC_Initialize)); |
EmitCallIC(ic, RelocInfo::CODE_TARGET); |