Index: src/compiler/linkage.cc |
diff --git a/src/compiler/linkage.cc b/src/compiler/linkage.cc |
index d4a366563a1180a137bf688f7ad823a0d1cb660c..d46830b317ddfe16e4540fc0f21aeb737a77a947 100644 |
--- a/src/compiler/linkage.cc |
+++ b/src/compiler/linkage.cc |
@@ -319,20 +319,22 @@ CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr, |
MachineType target_type = MachineType::AnyTagged(); |
// When entering into an OSR function from unoptimized code the JSFunction |
// is not in a register, but it is on the stack in the marker spill slot. |
- LinkageLocation target_loc = is_osr ? LinkageLocation::ForSavedCallerMarker() |
- : regloc(kJSFunctionRegister); |
- 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, // stack_parameter_count |
- Operator::kNoProperties, // properties |
- kNoCalleeSaved, // callee-saved |
- kNoCalleeSaved, // callee-saved fp |
- CallDescriptor::kCanUseRoots | // flags |
- flags, // flags |
+ LinkageLocation target_loc = is_osr |
+ ? LinkageLocation::ForSavedCallerFunction() |
+ : regloc(kJSFunctionRegister); |
+ 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, // stack_parameter_count |
+ Operator::kNoProperties, // properties |
+ kNoCalleeSaved, // callee-saved |
+ kNoCalleeSaved, // callee-saved fp |
+ CallDescriptor::kCanUseRoots | // flags |
+ CallDescriptor::kHasStandardFrameHeader | // flags |
+ flags, // flags |
"js-call"); |
} |
@@ -431,6 +433,9 @@ LinkageLocation Linkage::GetOsrValueLocation(int index) const { |
bool Linkage::ParameterHasSecondaryLocation(int index) const { |
+ if ((incoming_->flags() & CallDescriptor::kHasStandardFrameHeader) == 0) { |
Benedikt Meurer
2016/02/22 18:16:38
Nit: For "flags" I'd prefer to not use explicit co
danno
2016/03/07 09:33:38
Done.
|
+ return false; |
+ } |
if (incoming_->kind() != CallDescriptor::kCallJSFunction) return false; |
LinkageLocation loc = GetParameterLocation(index); |
return (loc == regloc(kJSFunctionRegister) || |