From e40deebae7ec618afd6ccec4a8d94057e0d6fac3 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 23 Oct 2009 14:28:35 -0700 Subject: [PATCH] Fixed decompiler assertion related to JSOP_TRACE (bug 522624, r=brendan). --- js/src/jsopcode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp index 9f5ee889168..492f780ef0e 100644 --- a/js/src/jsopcode.cpp +++ b/js/src/jsopcode.cpp @@ -4981,7 +4981,8 @@ js_DecompileFunction(JSPrinter *jp) #if JS_HAS_DESTRUCTURING /* Skip trace hint if it appears here. */ - if (js_GetOpcode(jp->sprinter.context, fun->u.i.script, pc) == JSOP_TRACE) { + JSOp op = js_GetOpcode(jp->sprinter.context, fun->u.i.script, pc); + if (op == JSOP_TRACE || op == JSOP_NOP) { JS_STATIC_ASSERT(JSOP_TRACE_LENGTH == JSOP_NOP_LENGTH); pc += JSOP_TRACE_LENGTH; }