Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index ec5d2c86a423473cd7a4e4a8561da2eae930c914..cdd925d7771d376a304a39700893321482bf3d39 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -717,18 +717,25 @@ void FullCodeGenerator::EmitDeclaration(Variable* variable, |
} 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(eax); |
VisitForAccumulatorValue(function); |
- __ pop(ecx); |
+ __ pop(edx); |
} else { |
- VisitForAccumulatorValue(prop->key()); |
- __ mov(ecx, result_register()); |
- __ mov(result_register(), Factory::the_hole_value()); |
+ __ mov(edx, eax); |
+ __ mov(eax, Factory::the_hole_value()); |
} |
- __ pop(edx); |
+ ASSERT(prop->key()->AsLiteral() != NULL && |
+ prop->key()->AsLiteral()->handle()->IsSmi()); |
+ __ Set(ecx, Immediate(prop->key()->AsLiteral()->handle())); |
Handle<Code> ic(Builtins::builtin(Builtins::KeyedStoreIC_Initialize)); |
EmitCallIC(ic, RelocInfo::CODE_TARGET); |