Bug 1169355 - Remove unnecessary assertion, r=jandem.
authorBrian Hackett <bhackett1024@gmail.com>
Thu, 28 May 2015 19:01:27 -0600
changeset 246131 62927f7a5705d70d906642eaa4d0f01c270670e2
parent 246130 c21058eb90ffe26db3c5b4cc1469e611800a9124
child 246132 43d11044cce3fb88203aeddd7030a0362ad59bf5
push id60375
push userbhackett@mozilla.com
push dateFri, 29 May 2015 01:01:34 +0000
treeherdermozilla-inbound@62927f7a5705 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs1169355
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1169355 - Remove unnecessary assertion, r=jandem.
js/src/jit/MacroAssembler.cpp
--- a/js/src/jit/MacroAssembler.cpp
+++ b/js/src/jit/MacroAssembler.cpp
@@ -128,17 +128,16 @@ MacroAssembler::guardTypeSetMightBeIncom
 }
 
 void
 MacroAssembler::guardObjectType(Register obj, const TypeSet *types,
                                 Register scratch, Label* miss)
 {
     MOZ_ASSERT(!types->unknown());
     MOZ_ASSERT(!types->hasType(TypeSet::AnyObjectType()));
-    MOZ_ASSERT(types->getObjectCount());
     MOZ_ASSERT(scratch != InvalidReg);
 
     // Note: this method elides read barriers on values read from type sets, as
     // this may be called off the main thread during Ion compilation. This is
     // safe to do as the final JitCode object will be allocated during the
     // incremental GC (or the compilation canceled before we start sweeping),
     // see CodeGenerator::link. Other callers should use TypeSet::readBarrier
     // to trigger the barrier on the contents of type sets passed in here.