Merge.
authorAndreas Gal <gal@mozilla.com>
Thu, 25 Sep 2008 11:32:00 -0700
changeset 19980 3d304a99805eb25ee7e8a408f204b3f7e2e94f26
parent 19979 34c61673341a7bf2dcd21fb6791bd10acbf99e97 (current diff)
parent 19978 4a988152e0e022ed8a32d059db74cbf6b2114316 (diff)
child 19981 437331f166fe9f8070fc5e54cd273933195083c6
push id2577
push userbrendan@mozilla.com
push dateWed, 01 Oct 2008 04:35:27 +0000
treeherdermozilla-central@a613924403d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1b1pre
Merge.
js/src/jstracer.cpp
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -3949,21 +3949,25 @@ bool
 TraceRecorder::record_JSOP_IFNE()
 {
     return ifop();
 }
 
 bool
 TraceRecorder::record_JSOP_ARGUMENTS()
 {
+#if 1
+    ABORT_TRACE("can't trace arguments yet");
+#else
     LIns* args[] = { cx_ins };
     LIns* a_ins = lir->insCall(F_Arguments, args);
     guard(false, lir->ins_eq0(a_ins), OOM_EXIT);
     stack(0, a_ins);
     return true;
+#endif
 }
 
 bool
 TraceRecorder::record_JSOP_DUP()
 {
     stack(0, get(&stackval(-1)));
     return true;
 }