Fix warnings pointed out by Waldo from apply patch (465214).
Fix warnings pointed out by Waldo from apply patch (465214).
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -4809,17 +4809,16 @@ js_Interpret(JSContext *cx)
goto error;
regs.sp = vp + 1;
LOAD_INTERRUPT_HANDLER(cx);
END_CASE(JSOP_NEW)
BEGIN_CASE(JSOP_CALL)
BEGIN_CASE(JSOP_EVAL)
BEGIN_CASE(JSOP_APPLY)
- do_call:
argc = GET_ARGC(regs.pc);
vp = regs.sp - (argc + 2);
lval = *vp;
if (VALUE_IS_FUNCTION(cx, lval)) {
obj = JSVAL_TO_OBJECT(lval);
fun = GET_FUNCTION_PRIVATE(cx, obj);
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -5619,17 +5619,17 @@ TraceRecorder::record_JSOP_SWAP()
set(&l, r_ins);
return true;
}
JS_REQUIRES_STACK bool
TraceRecorder::record_JSOP_PICK()
{
jsval* sp = cx->fp->regs->sp;
- jsuint n = cx->fp->regs->pc[1];
+ jsint n = cx->fp->regs->pc[1];
JS_ASSERT(sp - (n+1) >= StackBase(cx->fp));
LIns* top = tracker.get(sp - (n+1));
for (jsint i = 0; i < n; ++i)
set(sp - (n+1) + i, tracker.get(sp - n + i));
set(&sp[-1], top);
return true;
}