Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 03:05:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset c8ee3d056695 (bug 1264948)

Browse Source
This commit is contained in:
Sebastian Hengst 2016-06-10 19:34:39 +02:00
parent ca91e1647e
commit a6e15974a7
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/jit/MIR.h
View File

@ -7540,9 +7540,6 @@ class MPhi final
static MPhi* New(TempAllocator& alloc, MIRType resultType = MIRType::Value) {
return new(alloc) MPhi(alloc, resultType);
}
static MPhi* New(TempAllocator::Fallible alloc, MIRType resultType = MIRType::Value) {
return new(alloc) MPhi(alloc.alloc, resultType);
}
void removeOperand(size_t index);
void removeAllOperands();

6
js/src/jit/MIRGraph.cpp
View File

@ -1193,11 +1193,9 @@ MBasicBlock::addPredecessorPopN(TempAllocator& alloc, MBasicBlock* pred, uint32_
// Otherwise, create a new phi node.
MPhi* phi;
if (mine->type() == other->type())
phi = MPhi::New(alloc.fallible(), mine->type());
phi = MPhi::New(alloc, mine->type());
else
phi = MPhi::New(alloc.fallible());
if (!phi)
return false;
phi = MPhi::New(alloc);
addPhi(phi);
// Prime the phi for each predecessor, so input(x) comes from