Bug 1007298 - IonMonkey: Remove bogus assertion in pushDOMTypeBarrier. r=bz, a=sledru
authorHannes Verschore <hv1989@gmail.com>
Mon, 12 May 2014 10:55:23 +0200
changeset 199171 1f1a6bcbb933ef5c0657fcd46e8e3d911899c1e6
parent 199170 026ab1c41187b35f3222ed7804c88c1ee36cd72d
child 199172 5caea30192d0a1973fe6710b4df63f1f60779550
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, sledru
bugs1007298
milestone31.0a2
Bug 1007298 - IonMonkey: Remove bogus assertion in pushDOMTypeBarrier. r=bz, a=sledru
js/src/jit/IonBuilder.cpp
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -6325,19 +6325,16 @@ IonBuilder::pushDOMTypeBarrier(MInstruct
     // unbox as a double.  Instead, go ahead and barrier on having an int type,
     // since we know we need a barrier anyway due to the type mismatch.  This is
     // the only situation in which TI actually has more information about the
     // JSValueType than codegen can, short of jitinfo->returnType just being
     // JSVAL_TYPE_UNKNOWN.
     MDefinition* replace = ins;
     if (jitinfo->returnType() != JSVAL_TYPE_DOUBLE ||
         observed->getKnownMIRType() != MIRType_Int32) {
-        JS_ASSERT(jitinfo->returnType() == JSVAL_TYPE_UNKNOWN ||
-                  observed->getKnownMIRType() == MIRType_Value ||
-                  MIRTypeFromValueType(jitinfo->returnType()) == observed->getKnownMIRType());
         replace = ensureDefiniteType(ins, MIRTypeFromValueType(jitinfo->returnType()));
         if (replace != ins) {
             current->pop();
             current->push(replace);
         }
     } else {
         JS_ASSERT(barrier);
     }