Skip to content

V
V8
Commit 4398efe8 authored by machenbach@chromium.org's avatar machenbach@chromium.org
Browse files
Options

Reland "Remove flags argument from EmitCallWithStub" and "MIPS: Remove flags... 

Reland "Remove flags argument from EmitCallWithStub" and "MIPS: Remove flags argument from EmitCallWithStub.""

This reverts commit r18606 since suspected problems still remained.

BUG=
R=jkummerow@chromium.org
TBR=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/139013005

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18609 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent b0d92e0c
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 25 deletions
src/arm/full-codegen-arm.cc
View file @ 4398efe8
...@@ -2659,7 +2659,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, ...@@ -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. // Code common for calls using the call stub.
ZoneList<Expression*>* args = expr->arguments(); ZoneList<Expression*>* args = expr->arguments();
int arg_count = args->length(); int arg_count = args->length();
...@@ -2671,15 +2671,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { ...@@ -2671,15 +2671,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) {
// Record source position for debugger. // Record source position for debugger.
SetSourcePosition(expr->position()); SetSourcePosition(expr->position());
// Record call targets in unoptimized code.
flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET);
Handle<Object> uninitialized = Handle<Object> uninitialized =
TypeFeedbackCells::UninitializedSentinel(isolate()); TypeFeedbackCells::UninitializedSentinel(isolate());
Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized); Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized);
RecordTypeFeedbackCell(expr->CallFeedbackId(), cell); RecordTypeFeedbackCell(expr->CallFeedbackId(), cell);
__ mov(r2, Operand(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)); __ ldr(r1, MemOperand(sp, (arg_count + 1) * kPointerSize));
__ CallStub(&stub, expr->CallFeedbackId()); __ CallStub(&stub, expr->CallFeedbackId());
RecordJSReturnSite(expr); RecordJSReturnSite(expr);
...@@ -2806,7 +2805,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ...@@ -2806,7 +2805,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
// The receiver is either the global receiver or an object found // The receiver is either the global receiver or an object found
// by LoadContextSlot. // by LoadContextSlot.
EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); EmitCallWithStub(expr);
} else if (property != NULL) { } else if (property != NULL) {
{ PreservePositionScope scope(masm()->positions_recorder()); { PreservePositionScope scope(masm()->positions_recorder());
VisitForStackValue(property->obj()); VisitForStackValue(property->obj());
...@@ -2826,7 +2825,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ...@@ -2826,7 +2825,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
__ LoadRoot(r1, Heap::kUndefinedValueRootIndex); __ LoadRoot(r1, Heap::kUndefinedValueRootIndex);
__ push(r1); __ push(r1);
// Emit function call. // Emit function call.
EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); EmitCallWithStub(expr);
} }
#ifdef DEBUG #ifdef DEBUG
......
src/full-codegen.h
View file @ 4398efe8
...@@ -482,7 +482,7 @@ class FullCodeGenerator: public AstVisitor { ...@@ -482,7 +482,7 @@ class FullCodeGenerator: public AstVisitor {
void EmitReturnSequence(); void EmitReturnSequence();
// Platform-specific code sequences for calls // Platform-specific code sequences for calls
void EmitCallWithStub(Call* expr, CallFunctionFlags flags); void EmitCallWithStub(Call* expr);
void EmitCallWithIC(Call* expr, Handle<Object> name, ContextualMode mode); void EmitCallWithIC(Call* expr, Handle<Object> name, ContextualMode mode);
void EmitKeyedCallWithIC(Call* expr, Expression* key); void EmitKeyedCallWithIC(Call* expr, Expression* key);
......
src/ia32/full-codegen-ia32.cc
View file @ 4398efe8
...@@ -2613,7 +2613,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, ...@@ -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. // Code common for calls using the call stub.
ZoneList<Expression*>* args = expr->arguments(); ZoneList<Expression*>* args = expr->arguments();
int arg_count = args->length(); int arg_count = args->length();
...@@ -2625,15 +2625,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { ...@@ -2625,15 +2625,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) {
// Record source position for debugger. // Record source position for debugger.
SetSourcePosition(expr->position()); SetSourcePosition(expr->position());
// Record call targets in unoptimized code.
flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET);
Handle<Object> uninitialized = Handle<Object> uninitialized =
TypeFeedbackCells::UninitializedSentinel(isolate()); TypeFeedbackCells::UninitializedSentinel(isolate());
Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized); Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized);
RecordTypeFeedbackCell(expr->CallFeedbackId(), cell); RecordTypeFeedbackCell(expr->CallFeedbackId(), cell);
__ mov(ebx, 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)); __ mov(edi, Operand(esp, (arg_count + 1) * kPointerSize));
__ CallStub(&stub, expr->CallFeedbackId()); __ CallStub(&stub, expr->CallFeedbackId());
...@@ -2749,7 +2748,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ...@@ -2749,7 +2748,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
// The receiver is either the global receiver or an object found by // The receiver is either the global receiver or an object found by
// LoadContextSlot. // LoadContextSlot.
EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); EmitCallWithStub(expr);
} else if (property != NULL) { } else if (property != NULL) {
{ PreservePositionScope scope(masm()->positions_recorder()); { PreservePositionScope scope(masm()->positions_recorder());
...@@ -2770,7 +2769,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ...@@ -2770,7 +2769,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
} }
__ push(Immediate(isolate()->factory()->undefined_value())); __ push(Immediate(isolate()->factory()->undefined_value()));
// Emit function call. // Emit function call.
EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); EmitCallWithStub(expr);
} }
#ifdef DEBUG #ifdef DEBUG
......
src/mips/full-codegen-mips.cc
View file @ 4398efe8
...@@ -2693,7 +2693,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, ...@@ -2693,7 +2693,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. // Code common for calls using the call stub.
ZoneList<Expression*>* args = expr->arguments(); ZoneList<Expression*>* args = expr->arguments();
int arg_count = args->length(); int arg_count = args->length();
...@@ -2705,15 +2705,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { ...@@ -2705,15 +2705,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) {
// Record source position for debugger. // Record source position for debugger.
SetSourcePosition(expr->position()); SetSourcePosition(expr->position());
// Record call targets.
flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET);
Handle<Object> uninitialized = Handle<Object> uninitialized =
TypeFeedbackCells::UninitializedSentinel(isolate()); TypeFeedbackCells::UninitializedSentinel(isolate());
Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized); Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized);
RecordTypeFeedbackCell(expr->CallFeedbackId(), cell); RecordTypeFeedbackCell(expr->CallFeedbackId(), cell);
__ li(a2, Operand(cell)); __ li(a2, Operand(cell));
CallFunctionStub stub(arg_count, flags); // Record call targets in unoptimized code.
CallFunctionStub stub(arg_count, RECORD_CALL_TARGET);
__ lw(a1, MemOperand(sp, (arg_count + 1) * kPointerSize)); __ lw(a1, MemOperand(sp, (arg_count + 1) * kPointerSize));
__ CallStub(&stub, expr->CallFeedbackId()); __ CallStub(&stub, expr->CallFeedbackId());
RecordJSReturnSite(expr); RecordJSReturnSite(expr);
...@@ -2839,7 +2838,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ...@@ -2839,7 +2838,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
// The receiver is either the global receiver or an object found // The receiver is either the global receiver or an object found
// by LoadContextSlot. // by LoadContextSlot.
EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); EmitCallWithStub(expr);
} else if (property != NULL) { } else if (property != NULL) {
{ PreservePositionScope scope(masm()->positions_recorder()); { PreservePositionScope scope(masm()->positions_recorder());
VisitForStackValue(property->obj()); VisitForStackValue(property->obj());
...@@ -2859,7 +2858,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ...@@ -2859,7 +2858,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
__ LoadRoot(a1, Heap::kUndefinedValueRootIndex); __ LoadRoot(a1, Heap::kUndefinedValueRootIndex);
__ push(a1); __ push(a1);
// Emit function call. // Emit function call.
EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); EmitCallWithStub(expr);
} }
#ifdef DEBUG #ifdef DEBUG
......
src/x64/full-codegen-x64.cc
View file @ 4398efe8
...@@ -2596,7 +2596,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr, ...@@ -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. // Code common for calls using the call stub.
ZoneList<Expression*>* args = expr->arguments(); ZoneList<Expression*>* args = expr->arguments();
int arg_count = args->length(); int arg_count = args->length();
...@@ -2608,15 +2608,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) { ...@@ -2608,15 +2608,14 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) {
// Record source position for debugger. // Record source position for debugger.
SetSourcePosition(expr->position()); SetSourcePosition(expr->position());
// Record call targets in unoptimized code.
flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET);
Handle<Object> uninitialized = Handle<Object> uninitialized =
TypeFeedbackCells::UninitializedSentinel(isolate()); TypeFeedbackCells::UninitializedSentinel(isolate());
Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized); Handle<Cell> cell = isolate()->factory()->NewCell(uninitialized);
RecordTypeFeedbackCell(expr->CallFeedbackId(), cell); RecordTypeFeedbackCell(expr->CallFeedbackId(), cell);
__ Move(rbx, 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)); __ movq(rdi, Operand(rsp, (arg_count + 1) * kPointerSize));
__ CallStub(&stub, expr->CallFeedbackId()); __ CallStub(&stub, expr->CallFeedbackId());
RecordJSReturnSite(expr); RecordJSReturnSite(expr);
...@@ -2735,7 +2734,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ...@@ -2735,7 +2734,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
// The receiver is either the global receiver or an object found by // The receiver is either the global receiver or an object found by
// LoadContextSlot. // LoadContextSlot.
EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); EmitCallWithStub(expr);
} else if (property != NULL) { } else if (property != NULL) {
{ PreservePositionScope scope(masm()->positions_recorder()); { PreservePositionScope scope(masm()->positions_recorder());
VisitForStackValue(property->obj()); VisitForStackValue(property->obj());
...@@ -2754,7 +2753,7 @@ void FullCodeGenerator::VisitCall(Call* expr) { ...@@ -2754,7 +2753,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
} }
__ PushRoot(Heap::kUndefinedValueRootIndex); __ PushRoot(Heap::kUndefinedValueRootIndex);
// Emit function call. // Emit function call.
EmitCallWithStub(expr, NO_CALL_FUNCTION_FLAGS); EmitCallWithStub(expr);
} }
#ifdef DEBUG #ifdef DEBUG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment