wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

No bug - Fix merge conflict on a CLOSED TREE. r=red

Browse Source
This commit is contained in:
Jan de Mooij 2013-04-03 18:09:26 +02:00
parent 2c3adaae43
commit 7482d9d8cd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/ion/BaselineIC.cpp
View File

@ -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