From 5963ae48a84a9ebb65d9c8276c9a62e5d6c915cf Mon Sep 17 00:00:00 2001 From: "mstarzinger@chromium.org" Date: Wed, 16 Jul 2014 12:03:33 +0000 Subject: [PATCH] Rename [Load/Delete]ContextSlot for consistency after r22379. R=verwaest@chromium.org Review URL: https://codereview.chromium.org/397973002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22430 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm/full-codegen-arm.cc | 8 ++++---- src/arm64/full-codegen-arm64.cc | 8 ++++---- src/ia32/full-codegen-ia32.cc | 8 ++++---- src/mips/full-codegen-mips.cc | 8 ++++---- src/mips64/full-codegen-mips64.cc | 8 ++++---- src/runtime.cc | 15 +++++++-------- src/runtime.h | 6 +++--- src/x64/full-codegen-x64.cc | 8 ++++---- src/x87/full-codegen-x87.cc | 8 ++++---- tools/generate-runtime-tests.py | 10 +++++----- 10 files changed, 43 insertions(+), 44 deletions(-) diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc index ede1230..cbfec8e 100644 --- a/src/arm/full-codegen-arm.cc +++ b/src/arm/full-codegen-arm.cc @@ -1568,7 +1568,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) { __ bind(&slow); __ mov(r1, Operand(var->name())); __ Push(cp, r1); // Context and name. - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ bind(&done); context()->Plug(r0); } @@ -2770,7 +2770,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ASSERT(!context_register().is(r2)); __ mov(r2, Operand(proxy->name())); __ Push(context_register(), r2); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ Push(r0, r1); // Function, receiver. // If fast case code has been generated, emit code to push the @@ -4128,7 +4128,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { ASSERT(!context_register().is(r2)); __ mov(r2, Operand(var->name())); __ Push(context_register(), r2); - __ CallRuntime(Runtime::kDeleteContextSlot, 2); + __ CallRuntime(Runtime::kDeleteLookupSlot, 2); context()->Plug(r0); } } else { @@ -4406,7 +4406,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) { __ bind(&slow); __ mov(r0, Operand(proxy->name())); __ Push(cp, r0); - __ CallRuntime(Runtime::kLoadContextSlotNoReferenceError, 2); + __ CallRuntime(Runtime::kLoadLookupSlotNoReferenceError, 2); PrepareForBailout(expr, TOS_REG); __ bind(&done); diff --git a/src/arm64/full-codegen-arm64.cc b/src/arm64/full-codegen-arm64.cc index 7675916..0cf4ab9 100644 --- a/src/arm64/full-codegen-arm64.cc +++ b/src/arm64/full-codegen-arm64.cc @@ -1556,7 +1556,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) { Comment cmnt(masm_, "Lookup variable"); __ Mov(x1, Operand(var->name())); __ Push(cp, x1); // Context and name. - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ Bind(&done); context()->Plug(x0); break; @@ -2460,7 +2460,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { // and the object holding it (returned in x1). __ Mov(x10, Operand(proxy->name())); __ Push(context_register(), x10); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ Push(x0, x1); // Receiver, function. // If fast case code has been generated, emit code to push the @@ -3814,7 +3814,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { // context where the variable was introduced. __ Mov(x2, Operand(var->name())); __ Push(context_register(), x2); - __ CallRuntime(Runtime::kDeleteContextSlot, 2); + __ CallRuntime(Runtime::kDeleteLookupSlot, 2); context()->Plug(x0); } } else { @@ -4095,7 +4095,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) { __ Bind(&slow); __ Mov(x0, Operand(proxy->name())); __ Push(cp, x0); - __ CallRuntime(Runtime::kLoadContextSlotNoReferenceError, 2); + __ CallRuntime(Runtime::kLoadLookupSlotNoReferenceError, 2); PrepareForBailout(expr, TOS_REG); __ Bind(&done); diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc index 0dc3254..5184236 100644 --- a/src/ia32/full-codegen-ia32.cc +++ b/src/ia32/full-codegen-ia32.cc @@ -1499,7 +1499,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) { __ bind(&slow); __ push(esi); // Context. __ push(Immediate(var->name())); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ bind(&done); context()->Plug(eax); break; @@ -2687,7 +2687,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { // the object holding it (returned in edx). __ push(context_register()); __ push(Immediate(proxy->name())); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ push(eax); // Function. __ push(edx); // Receiver. @@ -4093,7 +4093,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { // context where the variable was introduced. __ push(context_register()); __ push(Immediate(var->name())); - __ CallRuntime(Runtime::kDeleteContextSlot, 2); + __ CallRuntime(Runtime::kDeleteLookupSlot, 2); context()->Plug(eax); } } else { @@ -4386,7 +4386,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) { __ bind(&slow); __ push(esi); __ push(Immediate(proxy->name())); - __ CallRuntime(Runtime::kLoadContextSlotNoReferenceError, 2); + __ CallRuntime(Runtime::kLoadLookupSlotNoReferenceError, 2); PrepareForBailout(expr, TOS_REG); __ bind(&done); diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc index a4ca21d..ce24d32 100644 --- a/src/mips/full-codegen-mips.cc +++ b/src/mips/full-codegen-mips.cc @@ -1564,7 +1564,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) { __ bind(&slow); __ li(a1, Operand(var->name())); __ Push(cp, a1); // Context and name. - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ bind(&done); context()->Plug(v0); } @@ -2765,7 +2765,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ASSERT(!context_register().is(a2)); __ li(a2, Operand(proxy->name())); __ Push(context_register(), a2); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ Push(v0, v1); // Function, receiver. // If fast case code has been generated, emit code to push the @@ -4158,7 +4158,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { ASSERT(!context_register().is(a2)); __ li(a2, Operand(var->name())); __ Push(context_register(), a2); - __ CallRuntime(Runtime::kDeleteContextSlot, 2); + __ CallRuntime(Runtime::kDeleteLookupSlot, 2); context()->Plug(v0); } } else { @@ -4441,7 +4441,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) { __ bind(&slow); __ li(a0, Operand(proxy->name())); __ Push(cp, a0); - __ CallRuntime(Runtime::kLoadContextSlotNoReferenceError, 2); + __ CallRuntime(Runtime::kLoadLookupSlotNoReferenceError, 2); PrepareForBailout(expr, TOS_REG); __ bind(&done); diff --git a/src/mips64/full-codegen-mips64.cc b/src/mips64/full-codegen-mips64.cc index 4eb60ea..5316135 100644 --- a/src/mips64/full-codegen-mips64.cc +++ b/src/mips64/full-codegen-mips64.cc @@ -1561,7 +1561,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) { __ bind(&slow); __ li(a1, Operand(var->name())); __ Push(cp, a1); // Context and name. - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ bind(&done); context()->Plug(v0); } @@ -2762,7 +2762,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ASSERT(!context_register().is(a2)); __ li(a2, Operand(proxy->name())); __ Push(context_register(), a2); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ Push(v0, v1); // Function, receiver. // If fast case code has been generated, emit code to push the @@ -4155,7 +4155,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { ASSERT(!context_register().is(a2)); __ li(a2, Operand(var->name())); __ Push(context_register(), a2); - __ CallRuntime(Runtime::kDeleteContextSlot, 2); + __ CallRuntime(Runtime::kDeleteLookupSlot, 2); context()->Plug(v0); } } else { @@ -4438,7 +4438,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) { __ bind(&slow); __ li(a0, Operand(proxy->name())); __ Push(cp, a0); - __ CallRuntime(Runtime::kLoadContextSlotNoReferenceError, 2); + __ CallRuntime(Runtime::kLoadLookupSlotNoReferenceError, 2); PrepareForBailout(expr, TOS_REG); __ bind(&done); diff --git a/src/runtime.cc b/src/runtime.cc index d980d32..c04c834 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -8978,7 +8978,7 @@ RUNTIME_FUNCTION(Runtime_DeclareModules) { } -RUNTIME_FUNCTION(Runtime_DeleteContextSlot) { +RUNTIME_FUNCTION(Runtime_DeleteLookupSlot) { HandleScope scope(isolate); ASSERT(args.length() == 2); @@ -9091,9 +9091,8 @@ static Object* ComputeReceiverForNonGlobal(Isolate* isolate, } -static ObjectPair LoadContextSlotHelper(Arguments args, - Isolate* isolate, - bool throw_error) { +static ObjectPair LoadLookupSlotHelper(Arguments args, Isolate* isolate, + bool throw_error) { HandleScope scope(isolate); ASSERT_EQ(2, args.length()); @@ -9189,13 +9188,13 @@ static ObjectPair LoadContextSlotHelper(Arguments args, } -RUNTIME_FUNCTION_RETURN_PAIR(Runtime_LoadContextSlot) { - return LoadContextSlotHelper(args, isolate, true); +RUNTIME_FUNCTION_RETURN_PAIR(Runtime_LoadLookupSlot) { + return LoadLookupSlotHelper(args, isolate, true); } -RUNTIME_FUNCTION_RETURN_PAIR(Runtime_LoadContextSlotNoReferenceError) { - return LoadContextSlotHelper(args, isolate, false); +RUNTIME_FUNCTION_RETURN_PAIR(Runtime_LoadLookupSlotNoReferenceError) { + return LoadLookupSlotHelper(args, isolate, false); } diff --git a/src/runtime.h b/src/runtime.h index fc561da..7d53bab 100644 --- a/src/runtime.h +++ b/src/runtime.h @@ -464,9 +464,9 @@ namespace internal { F(PushCatchContext, 3, 1) \ F(PushBlockContext, 2, 1) \ F(PushModuleContext, 2, 1) \ - F(DeleteContextSlot, 2, 1) \ - F(LoadContextSlot, 2, 2) \ - F(LoadContextSlotNoReferenceError, 2, 2) \ + F(DeleteLookupSlot, 2, 1) \ + F(LoadLookupSlot, 2, 2) \ + F(LoadLookupSlotNoReferenceError, 2, 2) \ F(StoreLookupSlot, 4, 1) \ \ /* Declarations and initialization */ \ diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc index 1b33848..696b853 100644 --- a/src/x64/full-codegen-x64.cc +++ b/src/x64/full-codegen-x64.cc @@ -1533,7 +1533,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) { __ bind(&slow); __ Push(rsi); // Context. __ Push(var->name()); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ bind(&done); context()->Plug(rax); break; @@ -2683,7 +2683,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { // the object holding it (returned in rdx). __ Push(context_register()); __ Push(proxy->name()); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ Push(rax); // Function. __ Push(rdx); // Receiver. @@ -4104,7 +4104,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { // context where the variable was introduced. __ Push(context_register()); __ Push(var->name()); - __ CallRuntime(Runtime::kDeleteContextSlot, 2); + __ CallRuntime(Runtime::kDeleteLookupSlot, 2); context()->Plug(rax); } } else { @@ -4393,7 +4393,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) { __ bind(&slow); __ Push(rsi); __ Push(proxy->name()); - __ CallRuntime(Runtime::kLoadContextSlotNoReferenceError, 2); + __ CallRuntime(Runtime::kLoadLookupSlotNoReferenceError, 2); PrepareForBailout(expr, TOS_REG); __ bind(&done); diff --git a/src/x87/full-codegen-x87.cc b/src/x87/full-codegen-x87.cc index debff6d..37c54a5 100644 --- a/src/x87/full-codegen-x87.cc +++ b/src/x87/full-codegen-x87.cc @@ -1496,7 +1496,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) { __ bind(&slow); __ push(esi); // Context. __ push(Immediate(var->name())); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ bind(&done); context()->Plug(eax); break; @@ -2681,7 +2681,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { // the object holding it (returned in edx). __ push(context_register()); __ push(Immediate(proxy->name())); - __ CallRuntime(Runtime::kLoadContextSlot, 2); + __ CallRuntime(Runtime::kLoadLookupSlot, 2); __ push(eax); // Function. __ push(edx); // Receiver. @@ -4086,7 +4086,7 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) { // context where the variable was introduced. __ push(context_register()); __ push(Immediate(var->name())); - __ CallRuntime(Runtime::kDeleteContextSlot, 2); + __ CallRuntime(Runtime::kDeleteLookupSlot, 2); context()->Plug(eax); } } else { @@ -4379,7 +4379,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) { __ bind(&slow); __ push(esi); __ push(Immediate(proxy->name())); - __ CallRuntime(Runtime::kLoadContextSlotNoReferenceError, 2); + __ CallRuntime(Runtime::kLoadLookupSlotNoReferenceError, 2); PrepareForBailout(expr, TOS_REG); __ bind(&done); diff --git a/tools/generate-runtime-tests.py b/tools/generate-runtime-tests.py index be12501..85b96d4 100755 --- a/tools/generate-runtime-tests.py +++ b/tools/generate-runtime-tests.py @@ -49,7 +49,7 @@ EXPAND_MACROS = [ # to parse them! EXPECTED_FUNCTION_COUNT = 417 EXPECTED_FUZZABLE_COUNT = 332 -EXPECTED_CCTEST_COUNT = 9 +EXPECTED_CCTEST_COUNT = 8 EXPECTED_UNKNOWN_COUNT = 4 EXPECTED_BUILTINS_COUNT = 810 @@ -152,10 +152,10 @@ BLACKLISTED = [ "PushCatchContext", "PushBlockContext", "PushModuleContext", - "DeleteContextSlot", - "LoadContextSlot", - "LoadContextSlotNoReferenceError", - "StoreContextSlot", + "DeleteLookupSlot", + "LoadLookupSlot", + "LoadLookupSlotNoReferenceError", + "StoreLookupSlot", # Declarations "DeclareGlobals", -- 2.7.4