Index: src/compiler/linkage.cc |
diff --git a/src/compiler/linkage.cc b/src/compiler/linkage.cc |
index 972745347a61e2089766baa106ba64b1133a95fa..384cf1c09ac473c26dbb572e89ba2af361bdc415 100644 |
--- a/src/compiler/linkage.cc |
+++ b/src/compiler/linkage.cc |
@@ -42,14 +42,16 @@ 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(zone, 1 + info->function()->parameter_count(), |
+ return GetJSCallDescriptor(zone, info->is_osr(), |
+ 1 + info->function()->parameter_count(), |
CallDescriptor::kNoFlags); |
} |
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(zone, 1 + shared->formal_parameter_count(), |
+ return GetJSCallDescriptor(zone, info->is_osr(), |
+ 1 + shared->formal_parameter_count(), |
CallDescriptor::kNoFlags); |
} |
if (info->code_stub() != NULL) { |
@@ -94,7 +96,7 @@ FrameOffset Linkage::GetFrameOffset(int spill_slot, Frame* frame, |
CallDescriptor* Linkage::GetJSCallDescriptor( |
int parameter_count, CallDescriptor::Flags flags) const { |
- return GetJSCallDescriptor(zone_, parameter_count, flags); |
+ return GetJSCallDescriptor(zone_, false, parameter_count, flags); |
} |
@@ -232,7 +234,7 @@ bool Linkage::NeedsFrameState(Runtime::FunctionId function) { |
// Provide unimplemented methods on unsupported architectures, to at least link. |
//============================================================================== |
#if !V8_TURBOFAN_BACKEND |
-CallDescriptor* Linkage::GetJSCallDescriptor(Isolate* isolate, Zone* zone, |
+CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr, |
int parameter_count, |
CallDescriptor::Flags flags) { |
UNIMPLEMENTED(); |
@@ -247,17 +249,17 @@ LinkageLocation Linkage::GetOsrValueLocation(int index) const { |
CallDescriptor* Linkage::GetRuntimeCallDescriptor( |
- Runtime::FunctionId function, int parameter_count, |
- Operator::Properties properties, Zone* zone) { |
+ Zone* zone, Runtime::FunctionId function, int parameter_count, |
+ Operator::Properties properties) { |
UNIMPLEMENTED(); |
return NULL; |
} |
CallDescriptor* Linkage::GetStubCallDescriptor( |
- const CallInterfaceDescriptor& descriptor, int stack_parameter_count, |
- CallDescriptor::Flags flags, Operator::Properties properties, |
- Zone* zone) { |
+ Isolate* isolate, Zone* zone, const CallInterfaceDescriptor& descriptor, |
+ int stack_parameter_count, CallDescriptor::Flags flags, |
+ Operator::Properties properties) { |
UNIMPLEMENTED(); |
return NULL; |
} |