From 6d3a852b9987bcc4f34762bd3dff1bf3a6e8d42b Mon Sep 17 00:00:00 2001
From: Andreas Gal <gal@mozilla.com>
Date: Wed, 9 Jul 2008 10:05:59 -0700
Subject: [PATCH] Removed assert that compares nativeFrameSlots to
 nativeFrameOffset since nativeFrameOffset is undefined in case sp is at
 sp+depth, so the assert sometimes randomly bites. Also fixed typo in cmp().
 trace-test.js compiles now.

---
 js/src/jstracer.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index f97234e73de4..2028c9343554 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -546,10 +546,8 @@ TraceRecorder::nativeFrameSlots(JSStackFrame* fp, JSFrameRegs& regs) const
         slots += 1/*rval*/ + (regs.sp - fp->spbase);
         if (fp->down)
             slots += fp->argc + fp->nvars;
-        if (fp == entryFrame) {
-            JS_ASSERT(nativeFrameOffset(&regs.sp[0])/sizeof(double) == slots);
+        if (fp == entryFrame) 
             return slots;
-        }
         fp = fp->down;
     }
     JS_NOT_REACHED("nativeFrameSlots");
@@ -1222,7 +1220,7 @@ TraceRecorder::cmp(LOpcode op, bool negate)
             cond = asNumber(l) >= asNumber(r);
             break;
           default:
-            JS_ASSERT(cond == LIR_feq);
+            JS_ASSERT(op == LIR_feq);
             cond = asNumber(l) == asNumber(r);
             break;
         }