| Index: src/full-codegen/x64/full-codegen-x64.cc
|
| diff --git a/src/full-codegen/x64/full-codegen-x64.cc b/src/full-codegen/x64/full-codegen-x64.cc
|
| index 690055351b8edbf71d979bebc96396eba020cfd8..a63832c9cbde82c227b65405f49ad0660dbfc046 100644
|
| --- a/src/full-codegen/x64/full-codegen-x64.cc
|
| +++ b/src/full-codegen/x64/full-codegen-x64.cc
|
| @@ -1380,12 +1380,11 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy,
|
| // by eval-introduced variables.
|
| EmitDynamicLookupFastCase(proxy, typeof_mode, &slow, &done);
|
| __ bind(&slow);
|
| - __ Push(rsi); // Context.
|
| __ 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(rax);
|
| @@ -2335,11 +2334,11 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op,
|
| (var->mode() == CONST && op == Token::INIT)) {
|
| if (var->IsLookupSlot()) {
|
| // Assignment to var.
|
| - __ Push(rax); // Value.
|
| - __ Push(rsi); // Context.
|
| __ Push(var->name());
|
| - __ Push(Smi::FromInt(language_mode()));
|
| - __ CallRuntime(Runtime::kStoreLookupSlot);
|
| + __ Push(rax);
|
| + __ CallRuntime(is_strict(language_mode())
|
| + ? Runtime::kStoreLookupSlot_Strict
|
| + : Runtime::kStoreLookupSlot_Sloppy);
|
| } else {
|
| // Assignment to var or initializing assignment to let/const in harmony
|
| // mode.
|
| @@ -2678,9 +2677,8 @@ void FullCodeGenerator::PushCalleeAndWithBaseObject(Call* expr) {
|
| __ bind(&slow);
|
| // Call the runtime to find the function to call (returned in rax) and
|
| // the object holding it (returned in rdx).
|
| - __ Push(context_register());
|
| __ Push(callee->name());
|
| - __ CallRuntime(Runtime::kLoadLookupSlot);
|
| + __ CallRuntime(Runtime::kLoadLookupSlotForCall);
|
| __ Push(rax); // Function.
|
| __ Push(rdx); // Receiver.
|
| PrepareForBailoutForId(expr->LookupId(), NO_REGISTERS);
|
|
|