mirror of
https://git.freebsd.org/ports.git
synced 2025-07-17 09:19:15 -04:00
a702c15488
This adds all the patches that were applied in the past to head, under contrib/llvm. After these, there only minimal diffs left between the port sources and the base sources. Most of these remaining diffs are due to #ifdef shortcuts in the base sources, because we don't compile certain features in. Other diffs are because the port has applied a few changes that we don't have in base. While here, use Makefile.LICENSE from the devel/llvm-devel port. Approved by: brooks (maintainer) Reviewed by: brooks PR: 212343, 225128, 225471, 226388, 226658, 226872, 229050, 230444, 230604, 231355 MFH: 2018Q4 Differential Revision: https://reviews.freebsd.org/D17702
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
r338689 | dim | 2018-09-14 21:25:23 +0200 (Fri, 14 Sep 2018) | 12 lines
|
|
|
|
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
|
|
|
|
Index: lib/CodeGen/BranchFolding.cpp
|
|
===================================================================
|
|
--- lib/CodeGen/BranchFolding.cpp (revision 338688)
|
|
+++ lib/CodeGen/BranchFolding.cpp (revision 338689)
|
|
@@ -884,11 +884,12 @@ void BranchFolder::mergeCommonTails(unsigned commo
|
|
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) {
|