Merge.
authorAndreas Gal <gal@mozilla.com>
Wed, 13 Aug 2008 16:43:46 -0700
changeset 18141 f603e7555aefded72dbfd1842476e20bcdeec8c7
parent 18140 55d6dbfeeab0582e354479ee3b053141484f9f34 (current diff)
parent 18137 ad0aef3a1a4256a4a1e58bfd03b811c127a45544 (diff)
child 18142 d96e0ab82bb857240580ce26f88172477c075eb5
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1a2pre
Merge.
js/src/jstracer.cpp
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -1913,17 +1913,17 @@ TraceRecorder::argval(unsigned n) const
 {
     JS_ASSERT(n < cx->fp->fun->nargs);
     return cx->fp->argv[n];
 }
 
 jsval&
 TraceRecorder::varval(unsigned n) const
 {
-    JS_ASSERT(n < cx->fp->script->nfixed);
+    JS_ASSERT(n < cx->fp->script->nslots);
     return cx->fp->slots[n];
 }
 
 jsval&
 TraceRecorder::stackval(int n) const
 {
     jsval* sp = cx->fp->regs->sp;
     JS_ASSERT(size_t((sp + n) - StackBase(cx->fp)) < StackDepth(cx->fp->script));