зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1264948 - MBasicBlock::addPredecessor, check for OOMs when allocating Phi nodes. r=h4writer
This commit is contained in:
Родитель
be19d8d845
Коммит
fcb7da1c37
|
@ -7156,6 +7156,9 @@ 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();
|
||||
|
|
|
@ -1193,9 +1193,11 @@ MBasicBlock::addPredecessorPopN(TempAllocator& alloc, MBasicBlock* pred, uint32_
|
|||
// Otherwise, create a new phi node.
|
||||
MPhi* phi;
|
||||
if (mine->type() == other->type())
|
||||
phi = MPhi::New(alloc, mine->type());
|
||||
phi = MPhi::New(alloc.fallible(), mine->type());
|
||||
else
|
||||
phi = MPhi::New(alloc);
|
||||
phi = MPhi::New(alloc.fallible());
|
||||
if (!phi)
|
||||
return false;
|
||||
addPhi(phi);
|
||||
|
||||
// Prime the phi for each predecessor, so input(x) comes from
|
||||
|
|
Загрузка…
Ссылка в новой задаче