Author: dim
Date: Mon Sep 17 14:53:03 2018
New Revision: 338710
URL: https://svnweb.freebsd.org/changeset/base/338710
Log:
MFC r338689:
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.
Reported by: Piotr Kubaj <[email protected]>
PR: 231355
Modified:
stable/11/contrib/llvm/lib/CodeGen/BranchFolding.cpp
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/llvm/lib/CodeGen/BranchFolding.cpp
==============================================================================
--- stable/11/contrib/llvm/lib/CodeGen/BranchFolding.cpp Mon Sep 17
11:24:16 2018 (r338709)
+++ stable/11/contrib/llvm/lib/CodeGen/BranchFolding.cpp Mon Sep 17
14:53:03 2018 (r338710)
@@ -884,11 +884,12 @@ void BranchFolder::mergeCommonTails(unsigned commonTai
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) {
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
