Fix regression of js1_5/GC/regress-341877-01.js noted in bug 523452 comment 11. rs=dmandelin.

This commit is contained in:
Jason Orendorff 2010-06-02 11:56:53 -07:00
parent b78259f52e
commit 882ce0d27b

View File

@ -11089,10 +11089,8 @@ JS_REQUIRES_STACK AbortableRecordingStatus
TraceRecorder::record_JSOP_DELELEM() TraceRecorder::record_JSOP_DELELEM()
{ {
jsval& lval = stackval(-2); jsval& lval = stackval(-2);
if (JSVAL_IS_PRIMITIVE(lval)) { if (JSVAL_IS_PRIMITIVE(lval))
AbortRecording(cx, "JSOP_DELELEM on primitive base expression"); RETURN_STOP_A("JSOP_DELELEM on primitive base expression");
return ARECORD_STOP;
}
jsval& idx = stackval(-1); jsval& idx = stackval(-1);
LIns* rval_ins; LIns* rval_ins;
@ -11104,8 +11102,7 @@ TraceRecorder::record_JSOP_DELELEM()
LIns* args[] = { get(&idx), get(&lval), cx_ins }; LIns* args[] = { get(&idx), get(&lval), cx_ins };
rval_ins = lir->insCall(&DeleteStrKey_ci, args); rval_ins = lir->insCall(&DeleteStrKey_ci, args);
} else { } else {
AbortRecording(cx, "JSOP_DELELEM on non-int, non-string index"); RETURN_STOP_A("JSOP_DELELEM on non-int, non-string index");
return ARECORD_STOP;
} }
set(&lval, rval_ins); set(&lval, rval_ins);