From 3b2e03ce16639c574808aaba7dcf45560fad2560 Mon Sep 17 00:00:00 2001 From: Jan de Mooij Date: Wed, 3 Apr 2013 18:09:26 +0200 Subject: [PATCH] No bug - Fix merge conflict on a CLOSED TREE. r=red --- js/src/ion/BaselineIC.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/ion/BaselineIC.cpp b/js/src/ion/BaselineIC.cpp index f48e89a39d17..34acd06f71a2 100644 --- a/js/src/ion/BaselineIC.cpp +++ b/js/src/ion/BaselineIC.cpp @@ -4617,7 +4617,7 @@ DoGetIntrinsicFallback(JSContext *cx, BaselineFrame *frame, ICGetIntrinsic_Fallb JS_ASSERT(op == JSOP_GETINTRINSIC || op == JSOP_CALLINTRINSIC); - if (!GetIntrinsicOperation(cx, script, pc, res)) + if (!GetIntrinsicOperation(cx, pc, res)) return false; // An intrinsic operation will always produce the same result, so only