Bug 463137 - TM/nanojit: type-check LIR (TM-specific part). r=jseward.

js/src/jsregexp.cpp

@@ -2290,7 +2290,7 @@ class RegExpNativeCompiler {
     Fragment*        fragment;
     LirWriter*       lir;
 #ifdef DEBUG
-    LirWriter*       sanity_filter;
+    LirWriter*       validate_writer;
 #endif
 #ifdef NJ_VERBOSE
     LirWriter*       verbose_filter;
@@ -3187,7 +3187,7 @@ class RegExpNativeCompiler {
         )
 #endif
 #ifdef DEBUG
-        lir = sanity_filter = new SanityFilter(lir);
+        lir = validate_writer = new ValidateWriter(lir, "regexp writer pipeline");
 #endif
 
         /*
@@ -3248,7 +3248,7 @@ class RegExpNativeCompiler {
 
         delete lirBufWriter;
 #ifdef DEBUG
-        delete sanity_filter;
+        delete validate_writer;
 #endif
 #ifdef NJ_VERBOSE
         debug_only_stmt( if (js_LogController.lcbits & LC_TMRegexp)
@@ -3273,7 +3273,7 @@ class RegExpNativeCompiler {
             delete lirBufWriter;
         }
 #ifdef DEBUG
-        delete sanity_filter;
+        delete validate_writer;
 #endif
 #ifdef NJ_VERBOSE
         debug_only_stmt( if (js_LogController.lcbits & LC_TMRegexp)

js/src/jstracer.cpp

@@ -2408,7 +2408,7 @@ TraceRecorder::TraceRecorder(JSContext* cx, VMSideExit* anchor, VMFragment* frag
     nanojit::LirWriter*& lir = InitConst(this->lir);
     lir = new (tempAlloc()) LirBufWriter(lirbuf);
 #ifdef DEBUG
-    lir = new (tempAlloc()) SanityFilter(lir);
+    lir = new (tempAlloc()) ValidateWriter(lir, "end of writer pipeline");
 #endif
     debug_only_stmt(
         if (js_LogController.lcbits & LC_TMRecorder) {
@@ -2423,7 +2423,7 @@ TraceRecorder::TraceRecorder(JSContext* cx, VMSideExit* anchor, VMFragment* frag
     lir = new (tempAlloc()) ExprFilter(lir);
     lir = new (tempAlloc()) FuncFilter(lir);
 #ifdef DEBUG
-    lir = new (tempAlloc()) SanityFilter(lir);
+    lir = new (tempAlloc()) ValidateWriter(lir, "start of writer pipeline");
 #endif
     lir->ins0(LIR_start);
 
@@ -11663,7 +11663,7 @@ TraceRecorder::setCallProp(JSObject *callobj, LIns *callobj_ins, JSScopeProperty
     br1->setTarget(label1);
     LIns* args[] = {
         box_jsval(v, v_ins),
-        INS_CONST(SPROP_USERID(sprop)),
+        INS_CONSTWORD(SPROP_USERID(sprop)),
         callobj_ins,
         cx_ins
     };