Backed out changeset 87f37f6cde59 (bug 1264948)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 15 Jun 2016 19:17:55 +0200
changeset 301902 fd1ff601b5614e582425b2ab4360d9a68f8c5008
parent 301901 4526172c1bda6e9985078bf1462a4f5d1d53dbe6
child 301903 57aca488acc1a2e2e53accb1e65ebcd19fa4bfab
push id78496
push userarchaeopteryx@coole-files.de
push dateWed, 15 Jun 2016 17:21:05 +0000
treeherdermozilla-inbound@dc371921454f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1264948
milestone50.0a1
backs out87f37f6cde598e58168536e9907c00f035cc375c
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
Backed out changeset 87f37f6cde59 (bug 1264948)
js/src/jit/IonBuilder.cpp
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -1409,19 +1409,16 @@ IonBuilder::maybeAddOsrTypeBarriers()
     MOZ_ASSERT(stackDepth == osrBlock->stackDepth());
     for (uint32_t slot = info().startArgSlot(); slot < stackDepth; slot++) {
         // Aliased slots are never accessed, since they need to go through
         // the callobject. The typebarriers are added there and can be
         // discarded here.
         if (info().isSlotAliasedAtOsr(slot))
             continue;
 
-        if (!alloc().ensureBallast())
-            return false;
-
         MInstruction* def = osrBlock->getSlot(slot)->toInstruction();
         MPhi* preheaderPhi = preheader->getSlot(slot)->toPhi();
         MPhi* headerPhi = headerRp->getOperand(slot)->toPhi();
 
         MIRType type = headerPhi->type();
         TemporaryTypeSet* typeSet = headerPhi->resultTypeSet();
 
         if (!addOsrValueTypeBarrier(slot, &def, type, typeSet))