Fix warnings pointed out by Waldo from apply patch (465214).
authorBrendan Eich <brendan@mozilla.org>
Fri, 19 Dec 2008 14:15:35 -0800
changeset 23102 a5bd620ceeea59969dc196f4d88310c42ac9eee9
parent 23101 229681f85e7aef406b41c6529a59addd969ff310
child 23103 173464ec399c3b5193a9996365c409fb636545e4
push id4346
push userrsayre@mozilla.com
push dateFri, 26 Dec 2008 01:26:36 +0000
treeherdermozilla-central@8eb5a5b83a93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs465214
milestone1.9.2a1pre
Fix warnings pointed out by Waldo from apply patch (465214).
js/src/jsinterp.cpp
js/src/jstracer.cpp
--- 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;
 }