Index: src/full-codegen/x87/full-codegen-x87.cc |
diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc |
index 3c019b8c6e13a604232325bc14d06f0c343009b2..87f743f13ba2d814a62bf3db56444ad33d1ee4a6 100644 |
--- a/src/full-codegen/x87/full-codegen-x87.cc |
+++ b/src/full-codegen/x87/full-codegen-x87.cc |
@@ -1354,13 +1354,11 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy, |
// Generate code for loading from variables potentially shadowed |
// by eval-introduced variables. |
EmitDynamicLookupFastCase(proxy, typeof_mode, &slow, &done); |
- __ bind(&slow); |
- __ push(esi); // Context. |
- __ push(Immediate(var->name())); |
+ __ Push(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 +2347,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(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 +2691,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 +3851,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); |
} |