AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Revert "Skip the CallFunctionStub when the callee function can be statically determined."

Browse Source 
This reverts commit 9845dfadd2 (r25042) for failing tests.

TBR=titzer@chromium.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#25044}
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@25044 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jarin@chromium.org 2014-10-31 19:05:31 +00:00
parent 66dd92f754
commit 6935e0131c
12 changed files with 67 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/arm/linkage-arm.cc
View File

@ -35,9 +35,8 @@ struct ArmLinkageHelperTraits {
typedef LinkageHelper<ArmLinkageHelperTraits> LH;
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone,
CallDescriptor::Flags flags) {
return LH::GetJSCallDescriptor(zone, parameter_count, flags);
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone) {
return LH::GetJSCallDescriptor(zone, parameter_count);
}

5
src/compiler/arm64/linkage-arm64.cc
View File

@ -35,9 +35,8 @@ struct Arm64LinkageHelperTraits {
typedef LinkageHelper<Arm64LinkageHelperTraits> LH;
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone,
CallDescriptor::Flags flags) {
return LH::GetJSCallDescriptor(zone, parameter_count, flags);
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone) {
return LH::GetJSCallDescriptor(zone, parameter_count);
}

5
src/compiler/ia32/linkage-ia32.cc
View File

@ -30,9 +30,8 @@ struct IA32LinkageHelperTraits {
typedef LinkageHelper<IA32LinkageHelperTraits> LH;
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone,
CallDescriptor::Flags flags) {
return LH::GetJSCallDescriptor(zone, parameter_count, flags);
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone) {
return LH::GetJSCallDescriptor(zone, parameter_count);
}

49
src/compiler/js-generic-lowering.cc
View File

@ -9,7 +9,6 @@
#include "src/compiler/js-generic-lowering.h"
#include "src/compiler/machine-operator.h"
#include "src/compiler/node-aux-data-inl.h"
#include "src/compiler/node-matchers.h"
#include "src/compiler/node-properties-inl.h"
#include "src/unique.h"
@ -406,47 +405,15 @@ void JSGenericLowering::LowerJSCallConstruct(Node* node) {
}
bool JSGenericLowering::TryLowerDirectJSCall(Node* node) {
// Lower to a direct call to a constant JSFunction if the arity matches.
const CallFunctionParameters& p = CallFunctionParametersOf(node->op());
int arg_count = static_cast<int>(p.arity() - 2);
HeapObjectMatcher<JSFunction> func(node->InputAt(0));
if (!func.HasValue()) return false;
Handle<JSFunction> function = func.Value().handle();
if (arg_count != function->shared()->formal_parameter_count()) return false;
int index = NodeProperties::FirstContextIndex(node);
// TODO(titzer): total hack to share function context constants.
// Remove this when the JSGraph canonicalizes heap constants.
Node* context = node->InputAt(index);
HeapObjectMatcher<Context> context_const(context);
if (!context_const.HasValue() ||
*(context_const.Value().handle()) != function->context()) {
context = jsgraph()->HeapConstant(Handle<Context>(function->context()));
}
node->ReplaceInput(index, context);
CallDescriptor* desc = linkage()->GetJSCallDescriptor(
1 + arg_count, jsgraph()->zone(), FlagsForNode(node));
PatchOperator(node, common()->Call(desc));
return true;
}
void JSGenericLowering::LowerJSCallFunction(Node* node) {
if (!TryLowerDirectJSCall(node)) {
// Call to computed function; use CallFunctionStub;
const CallFunctionParameters& p = CallFunctionParametersOf(node->op());
int arg_count = static_cast<int>(p.arity() - 2);
CallFunctionStub stub(isolate(), arg_count, p.flags());
CallInterfaceDescriptor d = stub.GetCallInterfaceDescriptor();
CallDescriptor* desc = linkage()->GetStubCallDescriptor(
d, static_cast<int>(p.arity() - 1), FlagsForNode(node));
Node* stub_code = CodeConstant(stub.GetCode());
PatchInsertInput(node, 0, stub_code);
PatchOperator(node, common()->Call(desc));
}
const CallFunctionParameters& p = CallFunctionParametersOf(node->op());
CallFunctionStub stub(isolate(), static_cast<int>(p.arity() - 2), p.flags());
CallInterfaceDescriptor d = stub.GetCallInterfaceDescriptor();
CallDescriptor* desc = linkage()->GetStubCallDescriptor(
d, static_cast<int>(p.arity() - 1), FlagsForNode(node));
Node* stub_code = CodeConstant(stub.GetCode());
PatchInsertInput(node, 0, stub_code);
PatchOperator(node, common()->Call(desc));
}

2
src/compiler/js-generic-lowering.h
View File

@ -66,8 +66,6 @@ class JSGenericLowering : public Reducer {
CompilationInfo* info_;
JSGraph* jsgraph_;
Linkage* linkage_;
bool TryLowerDirectJSCall(Node* node);
};
} // namespace compiler

86
src/compiler/linkage-impl.h
View File

@ -28,8 +28,8 @@ class LinkageHelper {
}
// TODO(turbofan): cache call descriptors for JSFunction calls.
static CallDescriptor* GetJSCallDescriptor(Zone* zone, int js_parameter_count,
CallDescriptor::Flags flags) {
static CallDescriptor* GetJSCallDescriptor(Zone* zone,
int js_parameter_count) {
const size_t return_count = 1;
const size_t context_count = 1;
const size_t parameter_count = js_parameter_count + context_count;
@ -56,17 +56,16 @@ class LinkageHelper {
// The target for JS function calls is the JSFunction object.
MachineType target_type = kMachAnyTagged;
LinkageLocation target_loc = regloc(LinkageTraits::JSCallFunctionReg());
return new (zone) CallDescriptor( // --
CallDescriptor::kCallJSFunction, // kind
target_type, // target MachineType
target_loc, // target location
types.Build(), // machine_sig
locations.Build(), // location_sig
js_parameter_count, // js_parameter_count
Operator::kNoProperties, // properties
kNoCalleeSaved, // callee-saved
flags, // flags
"js-call");
return new (zone) CallDescriptor(CallDescriptor::kCallJSFunction, // kind
target_type, // target MachineType
target_loc, // target location
types.Build(), // machine_sig
locations.Build(), // location_sig
js_parameter_count, // js_parameter_count
Operator::kNoProperties, // properties
kNoCalleeSaved, // callee-saved
CallDescriptor::kNeedsFrameState, // flags
"js-call");
}
@ -117,17 +116,16 @@ class LinkageHelper {
// The target for runtime calls is a code object.
MachineType target_type = kMachAnyTagged;
LinkageLocation target_loc = LinkageLocation::AnyRegister();
return new (zone) CallDescriptor( // --
CallDescriptor::kCallCodeObject, // kind
target_type, // target MachineType
target_loc, // target location
types.Build(), // machine_sig
locations.Build(), // location_sig
js_parameter_count, // js_parameter_count
properties, // properties
kNoCalleeSaved, // callee-saved
flags, // flags
function->name); // debug name
return new (zone) CallDescriptor(CallDescriptor::kCallCodeObject, // kind
target_type, // target MachineType
target_loc, // target location
types.Build(), // machine_sig
locations.Build(), // location_sig
js_parameter_count, // js_parameter_count
properties, // properties
kNoCalleeSaved, // callee-saved
flags, // flags
function->name); // debug name
}
@ -171,17 +169,16 @@ class LinkageHelper {
// The target for stub calls is a code object.
MachineType target_type = kMachAnyTagged;
LinkageLocation target_loc = LinkageLocation::AnyRegister();
return new (zone) CallDescriptor( // --
CallDescriptor::kCallCodeObject, // kind
target_type, // target MachineType
target_loc, // target location
types.Build(), // machine_sig
locations.Build(), // location_sig
js_parameter_count, // js_parameter_count
Operator::kNoProperties, // properties
kNoCalleeSaved, // callee-saved registers
flags, // flags
descriptor.DebugName(zone->isolate()));
return new (zone) CallDescriptor(CallDescriptor::kCallCodeObject, // kind
target_type, // target MachineType
target_loc, // target location
types.Build(), // machine_sig
locations.Build(), // location_sig
js_parameter_count, // js_parameter_count
Operator::kNoProperties, // properties
kNoCalleeSaved, // callee-saved registers
flags, // flags
descriptor.DebugName(zone->isolate()));
}
static CallDescriptor* GetSimplifiedCDescriptor(Zone* zone,
@ -204,16 +201,15 @@ class LinkageHelper {
// The target for C calls is always an address (i.e. machine pointer).
MachineType target_type = kMachPtr;
LinkageLocation target_loc = LinkageLocation::AnyRegister();
return new (zone) CallDescriptor( // --
CallDescriptor::kCallAddress, // kind
target_type, // target MachineType
target_loc, // target location
msig, // machine_sig
locations.Build(), // location_sig
0, // js_parameter_count
Operator::kNoProperties, // properties
LinkageTraits::CCalleeSaveRegisters(), CallDescriptor::kNoFlags,
"c-call");
return new (zone) CallDescriptor(CallDescriptor::kCallAddress, // kind
target_type, // target MachineType
target_loc, // target location
msig, // machine_sig
locations.Build(), // location_sig
0, // js_parameter_count
Operator::kNoProperties, // properties
LinkageTraits::CCalleeSaveRegisters(),
CallDescriptor::kNoFlags, "c-call");
}
static LinkageLocation regloc(Register reg) {

11
src/compiler/linkage.cc
View File

@ -42,15 +42,13 @@ CallDescriptor* Linkage::ComputeIncoming(Zone* zone, CompilationInfo* info) {
if (info->function() != NULL) {
// If we already have the function literal, use the number of parameters
// plus the receiver.
return GetJSCallDescriptor(1 + info->function()->parameter_count(), zone,
CallDescriptor::kNoFlags);
return GetJSCallDescriptor(1 + info->function()->parameter_count(), zone);
}
if (!info->closure().is_null()) {
// If we are compiling a JS function, use a JS call descriptor,
// plus the receiver.
SharedFunctionInfo* shared = info->closure()->shared();
return GetJSCallDescriptor(1 + shared->formal_parameter_count(), zone,
CallDescriptor::kNoFlags);
return GetJSCallDescriptor(1 + shared->formal_parameter_count(), zone);
}
if (info->code_stub() != NULL) {
// Use the code stub interface descriptor.
@ -90,9 +88,8 @@ FrameOffset Linkage::GetFrameOffset(int spill_slot, Frame* frame,
}
CallDescriptor* Linkage::GetJSCallDescriptor(
int parameter_count, CallDescriptor::Flags flags) const {
return GetJSCallDescriptor(parameter_count, zone_, flags);
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count) const {
return GetJSCallDescriptor(parameter_count, zone_);
}

6
src/compiler/linkage.h
View File

@ -174,10 +174,8 @@ class Linkage : public ZoneObject {
// The call descriptor for this compilation unit describes the locations
// of incoming parameters and the outgoing return value(s).
CallDescriptor* GetIncomingDescriptor() const { return incoming_; }
CallDescriptor* GetJSCallDescriptor(int parameter_count,
CallDescriptor::Flags flags) const;
static CallDescriptor* GetJSCallDescriptor(int parameter_count, Zone* zone,
CallDescriptor::Flags flags);
CallDescriptor* GetJSCallDescriptor(int parameter_count) const;
static CallDescriptor* GetJSCallDescriptor(int parameter_count, Zone* zone);
CallDescriptor* GetRuntimeCallDescriptor(
Runtime::FunctionId function, int parameter_count,
Operator::Properties properties) const;

5
src/compiler/mips/linkage-mips.cc
View File

@ -35,9 +35,8 @@ struct MipsLinkageHelperTraits {
typedef LinkageHelper<MipsLinkageHelperTraits> LH;
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone,
CallDescriptor::Flags flags) {
return LH::GetJSCallDescriptor(zone, parameter_count, flags);
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone) {
return LH::GetJSCallDescriptor(zone, parameter_count);
}

3
src/compiler/raw-machine-assembler.cc
View File

@ -99,8 +99,7 @@ Node* RawMachineAssembler::CallFunctionStub0(Node* function, Node* receiver,
Node* RawMachineAssembler::CallJS0(Node* function, Node* receiver,
Node* context, Node* frame_state) {
CallDescriptor* descriptor =
Linkage::GetJSCallDescriptor(1, zone(), CallDescriptor::kNeedsFrameState);
CallDescriptor* descriptor = Linkage::GetJSCallDescriptor(1, zone());
Node* call = graph()->NewNode(common()->Call(descriptor), function, receiver,
context, frame_state);
schedule()->AddNode(CurrentBlock(), call);

5
src/compiler/x64/linkage-x64.cc
View File

@ -49,9 +49,8 @@ struct X64LinkageHelperTraits {
typedef LinkageHelper<X64LinkageHelperTraits> LH;
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone,
CallDescriptor::Flags flags) {
return LH::GetJSCallDescriptor(zone, parameter_count, flags);
CallDescriptor* Linkage::GetJSCallDescriptor(int parameter_count, Zone* zone) {
return LH::GetJSCallDescriptor(zone, parameter_count);
}

3
test/cctest/compiler/test-linkage.cc
View File

@ -90,8 +90,7 @@ TEST(TestLinkageJSCall) {
Linkage linkage(info.zone(), &info);
for (int i = 0; i < 32; i++) {
CallDescriptor* descriptor =
linkage.GetJSCallDescriptor(i, CallDescriptor::kNoFlags);
CallDescriptor* descriptor = linkage.GetJSCallDescriptor(i);
CHECK_NE(NULL, descriptor);
CHECK_EQ(i, descriptor->JSParameterCount());
CHECK_EQ(1, descriptor->ReturnCount());