Bug 1105727 - IonMonkey: Don't abort compiling when inlining array join fails. r=nbp, a=sledru
authorHannes Verschore <hv1989@gmail.com>
Tue, 02 Dec 2014 17:43:25 -0800
changeset 235450 8ea69a2b5f125ba5903d84267274d93f5f0f3598
parent 235449 dca84e64ef769be6c52835435e18872dee909ada
child 235451 798ae4147b624b90c674c36471aa3816006e330b
push id611
push userraliiev@mozilla.com
push dateMon, 05 Jan 2015 23:23:16 +0000
treeherdermozilla-release@345cd3b9c445 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp, sledru
bugs1105727
milestone35.0
Bug 1105727 - IonMonkey: Don't abort compiling when inlining array join fails. r=nbp, a=sledru
js/src/jit/MCallOptimize.cpp
--- a/js/src/jit/MCallOptimize.cpp
+++ b/js/src/jit/MCallOptimize.cpp
@@ -504,24 +504,24 @@ IonBuilder::inlineArraySplice(CallInfo &
         return InliningStatus_Error;
     return InliningStatus_Inlined;
 }
 
 IonBuilder::InliningStatus
 IonBuilder::inlineArrayJoin(CallInfo &callInfo)
 {
     if (callInfo.argc() != 1 || callInfo.constructing())
-        return InliningStatus_Error;
+        return InliningStatus_NotInlined;
 
     if (getInlineReturnType() != MIRType_String)
-        return InliningStatus_Error;
+        return InliningStatus_NotInlined;
     if (callInfo.thisArg()->type() != MIRType_Object)
-        return InliningStatus_Error;
+        return InliningStatus_NotInlined;
     if (callInfo.getArg(0)->type() != MIRType_String)
-        return InliningStatus_Error;
+        return InliningStatus_NotInlined;
 
     callInfo.setImplicitlyUsedUnchecked();
 
     MArrayJoin *ins = MArrayJoin::New(alloc(), callInfo.thisArg(), callInfo.getArg(0));
 
     current->add(ins);
     current->push(ins);