From ca9ee7b53b4f8bde434654b4a78ce08ebdb4482c Mon Sep 17 00:00:00 2001 From: "verwaest@chromium.org" Date: Tue, 14 Jan 2014 17:31:31 +0000 Subject: [PATCH] Remove flags argument from EmitCallWithStub R=ishell@chromium.org Review URL: https://codereview.chromium.org/135653003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18598 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm/full-codegen-arm.cc | 11 +++++------ src/full-codegen.h | 2 +- src/ia32/full-codegen-ia32.cc | 11 +++++------ src/x64/full-codegen-x64.cc | 11 +++++------ 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc index 68a8d70..b787f69 100644 --- a/src/arm/full-codegen-arm.cc +++ b/src/arm/full-codegen-arm.cc @@ -2659,7 +2659,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, } -void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { +void FullCodeGenerator::EmitCallWithStub(Call* expr) { // Code common for calls using the call stub. ZoneList* args = expr->arguments(); int arg_count = args->length(); @@ -2671,15 +2671,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { // Record source position for debugger. SetSourcePosition(expr->position()); - // Record call targets in unoptimized code. - flags = static_cast(flags | RECORD_CALL_TARGET); Handle uninitialized = TypeFeedbackCells::UninitializedSentinel(isolate()); Handle cell = isolate()->factory()->NewCell(uninitialized); RecordTypeFeedbackCell(expr->CallFeedbackId(), cell); __ mov(r2, Operand(cell)); - CallFunctionStub stub(arg_count, flags); + // Record call targets in unoptimized code. + CallFunctionStub stub(arg_count, RECORD_CALL_TARGET); __ ldr(r1, MemOperand(sp, (arg_count + 1) * kPointerSize)); __ CallStub(&stub, expr->CallFeedbackId()); RecordJSReturnSite(expr); @@ -2806,7 +2805,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { // The receiver is either the global receiver or an object found // by LoadContextSlot. - EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); + EmitCallWithStub(expr); } else if (property != NULL) { { PreservePositionScope scope(masm()->positions_recorder()); VisitForStackValue(property->obj()); @@ -2826,7 +2825,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { __ LoadRoot(r1, Heap::kUndefinedValueRootIndex); __ push(r1); // Emit function call. - EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); + EmitCallWithStub(expr); } #ifdef DEBUG diff --git a/src/full-codegen.h b/src/full-codegen.h index edf333d..12f355a 100644 --- a/src/full-codegen.h +++ b/src/full-codegen.h @@ -482,7 +482,7 @@ class FullCodeGenerator: public AstVisitor { void EmitReturnSequence(); // Platform-specific code sequences for calls - void EmitCallWithStub(Call* expr, CallFunctionFlags flags); + void EmitCallWithStub(Call* expr); void EmitCallWithIC(Call* expr, Handle name, ContextualMode mode); void EmitKeyedCallWithIC(Call* expr, Expression* key); diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc index 7159d5c..14e3df6 100644 --- a/src/ia32/full-codegen-ia32.cc +++ b/src/ia32/full-codegen-ia32.cc @@ -2613,7 +2613,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, } -void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { +void FullCodeGenerator::EmitCallWithStub(Call* expr) { // Code common for calls using the call stub. ZoneList* args = expr->arguments(); int arg_count = args->length(); @@ -2625,15 +2625,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { // Record source position for debugger. SetSourcePosition(expr->position()); - // Record call targets in unoptimized code. - flags = static_cast(flags | RECORD_CALL_TARGET); Handle uninitialized = TypeFeedbackCells::UninitializedSentinel(isolate()); Handle cell = isolate()->factory()->NewCell(uninitialized); RecordTypeFeedbackCell(expr->CallFeedbackId(), cell); __ mov(ebx, cell); - CallFunctionStub stub(arg_count, flags); + // Record call targets in unoptimized code. + CallFunctionStub stub(arg_count, RECORD_CALL_TARGET); __ mov(edi, Operand(esp, (arg_count + 1) * kPointerSize)); __ CallStub(&stub, expr->CallFeedbackId()); @@ -2749,7 +2748,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { // The receiver is either the global receiver or an object found by // LoadContextSlot. - EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); + EmitCallWithStub(expr); } else if (property != NULL) { { PreservePositionScope scope(masm()->positions_recorder()); @@ -2770,7 +2769,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { } __ push(Immediate(isolate()->factory()->undefined_value())); // Emit function call. - EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); + EmitCallWithStub(expr); } #ifdef DEBUG diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc index e4d9828..3b4c07c 100644 --- a/src/x64/full-codegen-x64.cc +++ b/src/x64/full-codegen-x64.cc @@ -2596,7 +2596,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, } -void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { +void FullCodeGenerator::EmitCallWithStub(Call* expr) { // Code common for calls using the call stub. ZoneList* args = expr->arguments(); int arg_count = args->length(); @@ -2608,15 +2608,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { // Record source position for debugger. SetSourcePosition(expr->position()); - // Record call targets in unoptimized code. - flags = static_cast(flags | RECORD_CALL_TARGET); Handle uninitialized = TypeFeedbackCells::UninitializedSentinel(isolate()); Handle cell = isolate()->factory()->NewCell(uninitialized); RecordTypeFeedbackCell(expr->CallFeedbackId(), cell); __ Move(rbx, cell); - CallFunctionStub stub(arg_count, flags); + // Record call targets in unoptimized code. + CallFunctionStub stub(arg_count, RECORD_CALL_TARGET); __ movq(rdi, Operand(rsp, (arg_count + 1) * kPointerSize)); __ CallStub(&stub, expr->CallFeedbackId()); RecordJSReturnSite(expr); @@ -2735,7 +2734,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { // The receiver is either the global receiver or an object found by // LoadContextSlot. - EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); + EmitCallWithStub(expr); } else if (property != NULL) { { PreservePositionScope scope(masm()->positions_recorder()); VisitForStackValue(property->obj()); @@ -2754,7 +2753,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { } __ PushRoot(Heap::kUndefinedValueRootIndex); // Emit function call. - EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); + EmitCallWithStub(expr); } #ifdef DEBUG -- 2.7.4