Pull in r335365 from upstream llvm trunk (by Krzysztof Parzyszek):
Initialize LiveRegs once in BranchFolder::mergeCommonTails This should fix '(TRI && "LivePhysRegs is not initialized."' assertions when building the lang/qt5-qml port in certain configurations. Approved by: re (kib) Reported by: Piotr Kubaj <pkubaj@anongoth.pl> PR: 231355 MFC after: 3 days
This commit is contained in:
parent
6760585add
commit
df57b3139f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=338689
@ -884,11 +884,12 @@ void BranchFolder::mergeCommonTails(unsigned commonTailIndex) {
|
||||
if (UpdateLiveIns) {
|
||||
LivePhysRegs NewLiveIns(*TRI);
|
||||
computeLiveIns(NewLiveIns, *MBB);
|
||||
LiveRegs.init(*TRI);
|
||||
|
||||
// The flag merging may lead to some register uses no longer using the
|
||||
// <undef> flag, add IMPLICIT_DEFs in the predecessors as necessary.
|
||||
for (MachineBasicBlock *Pred : MBB->predecessors()) {
|
||||
LiveRegs.init(*TRI);
|
||||
LiveRegs.clear();
|
||||
LiveRegs.addLiveOuts(*Pred);
|
||||
MachineBasicBlock::iterator InsertBefore = Pred->getFirstTerminator();
|
||||
for (unsigned Reg : NewLiveIns) {
|
||||
|
Loading…
Reference in New Issue
Block a user