From 882ce0d27bfaac159d4980f9d5ee19cbca9eaaec Mon Sep 17 00:00:00 2001 From: Jason Orendorff Date: Wed, 2 Jun 2010 11:56:53 -0700 Subject: [PATCH] Fix regression of js1_5/GC/regress-341877-01.js noted in bug 523452 comment 11. rs=dmandelin. --- js/src/jstracer.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp index 0727766099a..11aabe888be 100644 --- a/js/src/jstracer.cpp +++ b/js/src/jstracer.cpp @@ -11089,10 +11089,8 @@ JS_REQUIRES_STACK AbortableRecordingStatus TraceRecorder::record_JSOP_DELELEM() { jsval& lval = stackval(-2); - if (JSVAL_IS_PRIMITIVE(lval)) { - AbortRecording(cx, "JSOP_DELELEM on primitive base expression"); - return ARECORD_STOP; - } + if (JSVAL_IS_PRIMITIVE(lval)) + RETURN_STOP_A("JSOP_DELELEM on primitive base expression"); jsval& idx = stackval(-1); LIns* rval_ins; @@ -11104,8 +11102,7 @@ TraceRecorder::record_JSOP_DELELEM() LIns* args[] = { get(&idx), get(&lval), cx_ins }; rval_ins = lir->insCall(&DeleteStrKey_ci, args); } else { - AbortRecording(cx, "JSOP_DELELEM on non-int, non-string index"); - return ARECORD_STOP; + RETURN_STOP_A("JSOP_DELELEM on non-int, non-string index"); } set(&lval, rval_ins);