Index: src/full-codegen/ia32/full-codegen-ia32.cc |
diff --git a/src/full-codegen/ia32/full-codegen-ia32.cc b/src/full-codegen/ia32/full-codegen-ia32.cc |
index b9280ba361d1e05b63b3cbc6ffdfbc048a7acc25..deed409d02b8dc5647018e3f11b1347e32aeaf2f 100644 |
--- a/src/full-codegen/ia32/full-codegen-ia32.cc |
+++ b/src/full-codegen/ia32/full-codegen-ia32.cc |
@@ -1355,12 +1355,11 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy, |
// by eval-introduced variables. |
EmitDynamicLookupFastCase(proxy, typeof_mode, &slow, &done); |
__ bind(&slow); |
- __ push(esi); // Context. |
__ push(Immediate(var->name())); |
Runtime::FunctionId function_id = |
typeof_mode == NOT_INSIDE_TYPEOF |
? Runtime::kLoadLookupSlot |
- : Runtime::kLoadLookupSlotNoReferenceError; |
+ : Runtime::kLoadLookupSlotInsideTypeof; |
__ CallRuntime(function_id); |
__ bind(&done); |
context()->Plug(eax); |
@@ -2349,11 +2348,11 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op, |
(var->mode() == CONST && op == Token::INIT)) { |
if (var->IsLookupSlot()) { |
// Assignment to var. |
- __ push(eax); // Value. |
- __ push(esi); // Context. |
- __ push(Immediate(var->name())); |
- __ push(Immediate(Smi::FromInt(language_mode()))); |
- __ CallRuntime(Runtime::kStoreLookupSlot); |
+ __ Push(Immediate(var->name())); |
+ __ Push(eax); |
+ __ CallRuntime(is_strict(language_mode()) |
+ ? Runtime::kStoreLookupSlot_Strict |
+ : Runtime::kStoreLookupSlot_Sloppy); |
} else { |
// Assignment to var or initializing assignment to let/const in harmony |
// mode. |
@@ -2693,11 +2692,10 @@ void FullCodeGenerator::PushCalleeAndWithBaseObject(Call* expr) { |
__ bind(&slow); |
// Call the runtime to find the function to call (returned in eax) and |
// the object holding it (returned in edx). |
- __ push(context_register()); |
- __ push(Immediate(callee->name())); |
- __ CallRuntime(Runtime::kLoadLookupSlot); |
- __ push(eax); // Function. |
- __ push(edx); // Receiver. |
+ __ Push(callee->name()); |
+ __ CallRuntime(Runtime::kLoadLookupSlotForCall); |
+ __ Push(eax); // Function. |
+ __ Push(edx); // Receiver. |
PrepareForBailoutForId(expr->LookupId(), NO_REGISTERS); |
// If fast case code has been generated, emit code to push the function |
@@ -3854,8 +3852,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { |
} else { |
// Non-global variable. Call the runtime to try to delete from the |
// context where the variable was introduced. |
- __ push(context_register()); |
- __ push(Immediate(var->name())); |
+ __ Push(var->name()); |
__ CallRuntime(Runtime::kDeleteLookupSlot); |
context()->Plug(eax); |
} |