From 20df1932027cbc2fbd1f49d36bb6b24cc649b29f Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Thu, 24 Sep 2020 09:49:59 +0200 Subject: [PATCH 1/8] [PowerPC] PPCBoolRetToInt: Don't translate Constant's operands --- debian/changelog | 5 + ...Int-Dont-translate-Constants-operands.diff | 96 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 102 insertions(+) create mode 100644 debian/patches/PowerPC-PPCBoolRetToInt-Dont-translate-Constants-operands.diff diff --git a/debian/changelog b/debian/changelog index 9924d5ae..9cfe0d1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ llvm-toolchain-10 (1:10.0.1-6) unstable; urgency=medium + [ Sylvestre Ledru ] * Add debian/* to the copyright file. Uses the same license as LLVM + [ Julien Cristau ] + * Cherry-pick "[PowerPC] PPCBoolRetToInt: Don't translate Constant's + operands". Fixes rustc crash building firefox-esr. + -- Sylvestre Ledru Wed, 02 Sep 2020 13:55:46 +0200 llvm-toolchain-10 (1:10.0.1-5) unstable; urgency=medium diff --git a/debian/patches/PowerPC-PPCBoolRetToInt-Dont-translate-Constants-operands.diff b/debian/patches/PowerPC-PPCBoolRetToInt-Dont-translate-Constants-operands.diff new file mode 100644 index 00000000..0f0cd41a --- /dev/null +++ b/debian/patches/PowerPC-PPCBoolRetToInt-Dont-translate-Constants-operands.diff @@ -0,0 +1,96 @@ +From cbea17568f4301582c1d5d43990f089ca6cff522 Mon Sep 17 00:00:00 2001 +From: Kai Luo +Date: Fri, 28 Aug 2020 01:56:12 +0000 +Subject: [PATCH] [PowerPC] PPCBoolRetToInt: Don't translate Constant's + operands + +When collecting `i1` values via `findAllDefs`, ignore Constant's +operands, since Constant's operands might not be `i1`. + +Fixes https://bugs.llvm.org/show_bug.cgi?id=46923 which causes ICE +``` +llvm-project/llvm/lib/IR/Constants.cpp:1924: static llvm::Constant *llvm::ConstantExpr::getZExt(llvm::Constant *, llvm::Type *, bool): Assertion `C->getType()->getScalarSizeInBits() < Ty->getScalarSizeInBits()&& "SrcTy must be smaller than DestTy for ZExt!"' failed. +``` + +Differential Revision: https://reviews.llvm.org/D85007 +--- + llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp | 15 ++++++----- + llvm/test/CodeGen/PowerPC/pr46923.ll | 29 +++++++++++++++++++++ + 2 files changed, 38 insertions(+), 6 deletions(-) + create mode 100644 llvm/test/CodeGen/PowerPC/pr46923.ll + +diff --git a/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp b/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp +index acc8b317a220..172f1346c507 100644 +--- a/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp ++++ b/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp +@@ -78,9 +78,9 @@ class PPCBoolRetToInt : public FunctionPass { + Value *Curr = WorkList.back(); + WorkList.pop_back(); + auto *CurrUser = dyn_cast(Curr); +- // Operands of CallInst are skipped because they may not be Bool type, +- // and their positions are defined by ABI. +- if (CurrUser && !isa(Curr)) ++ // Operands of CallInst/Constant are skipped because they may not be Bool ++ // type. For CallInst, their positions are defined by ABI. ++ if (CurrUser && !isa(Curr) && !isa(Curr)) + for (auto &Op : CurrUser->operands()) + if (Defs.insert(Op).second) + WorkList.push_back(Op); +@@ -90,6 +90,9 @@ class PPCBoolRetToInt : public FunctionPass { + + // Translate a i1 value to an equivalent i32/i64 value: + Value *translate(Value *V) { ++ assert(V->getType() == Type::getInt1Ty(V->getContext()) && ++ "Expect an i1 value"); ++ + Type *IntTy = ST->isPPC64() ? Type::getInt64Ty(V->getContext()) + : Type::getInt32Ty(V->getContext()); + +@@ -252,9 +255,9 @@ class PPCBoolRetToInt : public FunctionPass { + auto *First = dyn_cast(Pair.first); + auto *Second = dyn_cast(Pair.second); + assert((!First || Second) && "translated from user to non-user!?"); +- // Operands of CallInst are skipped because they may not be Bool type, +- // and their positions are defined by ABI. +- if (First && !isa(First)) ++ // Operands of CallInst/Constant are skipped because they may not be Bool ++ // type. For CallInst, their positions are defined by ABI. ++ if (First && !isa(First) && !isa(First)) + for (unsigned i = 0; i < First->getNumOperands(); ++i) + Second->setOperand(i, BoolToIntMap[First->getOperand(i)]); + } +diff --git a/llvm/test/CodeGen/PowerPC/pr46923.ll b/llvm/test/CodeGen/PowerPC/pr46923.ll +new file mode 100644 +index 000000000000..3e9faa60422a +--- /dev/null ++++ b/llvm/test/CodeGen/PowerPC/pr46923.ll +@@ -0,0 +1,29 @@ ++; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py ++; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-unknown \ ++; RUN: -ppc-asm-full-reg-names < %s | FileCheck %s ++ ++@bar = external constant i64, align 8 ++ ++define i1 @foo() { ++; CHECK-LABEL: foo: ++; CHECK: # %bb.0: # %entry ++; CHECK-NEXT: li r3, 0 ++; CHECK-NEXT: isel r3, 0, r3, 4*cr5+lt ++; CHECK-NEXT: blr ++entry: ++ br label %next ++ ++next: ++ br i1 undef, label %true, label %false ++ ++true: ++ br label %end ++ ++false: ++ br label %end ++ ++end: ++ %a = phi i1 [ icmp ugt (i64 0, i64 ptrtoint (i64* @bar to i64)), %true ], ++ [ icmp ugt (i64 0, i64 2), %false ] ++ ret i1 %a ++} diff --git a/debian/patches/series b/debian/patches/series index 48789a1d..759e0195 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -147,3 +147,4 @@ ubuntu-groovy.diff clang_vendor_pass_stage2.diff remove-trailing-space-version.diff mips-force-nomadd4.patch +PowerPC-PPCBoolRetToInt-Dont-translate-Constants-operands.diff From 2d2d5254d19190f81b5d6883b2ea29d28c8f756f Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 29 Aug 2020 00:04:54 +0200 Subject: [PATCH 2/8] debian/patches/hurd/hurd-cxx-paths.diff: Add missing GCC installation initialization. --- debian/changelog | 7 +++++++ debian/patches/hurd/hurd-cxx-paths.diff | 19 ++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9cfe0d1a..c936714d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-10 (1:10.0.1-7) UNRELEASED; urgency=medium + + * debian/patches/hurd/hurd-cxx-paths.diff: Add missing GCC installation + initialization. + + -- Samuel Thibault Thu, 27 Aug 2020 17:06:44 +0200 + llvm-toolchain-10 (1:10.0.1-6) unstable; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/patches/hurd/hurd-cxx-paths.diff b/debian/patches/hurd/hurd-cxx-paths.diff index 457b472f..8759b77f 100644 --- a/debian/patches/hurd/hurd-cxx-paths.diff +++ b/debian/patches/hurd/hurd-cxx-paths.diff @@ -3,13 +3,13 @@ hurd: find c++ headers This should be factorized with Linux.cpp and the GNU/kFreeBSD case. --- - clang/lib/Driver/ToolChains/Hurd.cpp | 146 ++++++++++++++++++++++++++++++++++- + clang/lib/Driver/ToolChains/Hurd.cpp | 149 ++++++++++++++++++++++++++++++++++- clang/lib/Driver/ToolChains/Hurd.h | 3 - 2 files changed, 145 insertions(+), 4 deletions(-) + 2 files changed, 148 insertions(+), 4 deletions(-) --- a/clang/lib/Driver/ToolChains/Hurd.cpp +++ b/clang/lib/Driver/ToolChains/Hurd.cpp -@@ -61,6 +61,15 @@ static StringRef getOSLibDir(const llvm: +@@ -61,8 +61,20 @@ static StringRef getOSLibDir(const llvm: return Triple.isArch32Bit() ? "lib" : "lib64"; } @@ -24,8 +24,13 @@ This should be factorized with Linux.cpp and the GNU/kFreeBSD case. + Hurd::Hurd(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) : Generic_ELF(D, Triple, Args) { ++ GCCInstallation.init(Triple, Args); ++ Multilibs = GCCInstallation.getMultilibs(); ++ SelectedMultilib = GCCInstallation.getMultilib(); std::string SysRoot = computeSysRoot(); -@@ -73,8 +82,61 @@ Hurd::Hurd(const Driver &D, const llvm:: + path_list &Paths = getFilePaths(); + +@@ -73,8 +85,61 @@ Hurd::Hurd(const Driver &D, const llvm:: ExtraOpts.push_back("--build-id"); #endif @@ -89,7 +94,7 @@ This should be factorized with Linux.cpp and the GNU/kFreeBSD case. // FIXME: It's not clear whether we should use the driver's installed // directory ('Dir' below) or the ResourceDir. if (StringRef(D.Dir).startswith(SysRoot)) { -@@ -88,8 +150,40 @@ Hurd::Hurd(const Driver &D, const llvm:: +@@ -88,8 +153,40 @@ Hurd::Hurd(const Driver &D, const llvm:: addPathIfExists(D, SysRoot + "/usr/lib/" + MultiarchTriple, Paths); addPathIfExists(D, SysRoot + "/usr/lib/../" + OSLibDir, Paths); @@ -132,7 +137,7 @@ This should be factorized with Linux.cpp and the GNU/kFreeBSD case. // FIXME: It's not clear whether we should use the driver's installed // directory ('Dir' below) or the ResourceDir. if (StringRef(D.Dir).startswith(SysRoot)) -@@ -156,6 +250,17 @@ void Hurd::AddClangSystemIncludeArgs(con +@@ -156,6 +253,17 @@ void Hurd::AddClangSystemIncludeArgs(con // Lacking those, try to detect the correct set of system includes for the // target triple. @@ -150,7 +155,7 @@ This should be factorized with Linux.cpp and the GNU/kFreeBSD case. if (getTriple().getArch() == llvm::Triple::x86) { std::string Path = SysRoot + "/usr/include/i386-gnu"; if (D.getVFS().exists(Path)) -@@ -174,3 +279,36 @@ void Hurd::addExtraOpts(llvm::opt::ArgSt +@@ -174,3 +282,36 @@ void Hurd::addExtraOpts(llvm::opt::ArgSt for (const auto &Opt : ExtraOpts) CmdArgs.push_back(Opt.c_str()); } From 461582613104b9a51a7f092c5e6e402859793e59 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 7 Oct 2020 16:39:38 +0200 Subject: [PATCH 3/8] rc6 upload --- debian/changelog | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 983fc9ec..acb62c41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ -llvm-toolchain-11 (1:11.0.0~+rc5-2) UNRELEASED; urgency=medium +llvm-toolchain-11 (1:11.0.0~+rc6-1) unstable; urgency=medium [ Sylvestre Ledru ] + * New rc release * remove all artifacts after tests [ Gianfranco Costamagna ] - * qualify-clang.sh: exclude z3 tests when support is not available, not based on libz3-dev installation but on the error returned by clang invocation + * qualify-clang.sh: exclude z3 tests when support is not available, + not based on libz3-dev installation but on the error returned by + clang invocation - -- Gianfranco Costamagna Thu, 01 Oct 2020 15:12:29 +0200 + -- Sylvestre Ledru Wed, 07 Oct 2020 16:38:40 +0200 llvm-toolchain-11 (1:11.0.0~+rc5-1) unstable; urgency=medium From 1bda59d2ac03be1e9f497ca51ebda50cf659fe7c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 12 Oct 2020 11:22:28 +0200 Subject: [PATCH 4/8] New upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index acb62c41..4f580c15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-11 (1:11.0.0-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Mon, 12 Oct 2020 11:14:19 +0200 + llvm-toolchain-11 (1:11.0.0~+rc6-1) unstable; urgency=medium [ Sylvestre Ledru ] From d98146afc4b798d00febcac09f841e6179c50100 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 12 Oct 2020 15:15:40 +0200 Subject: [PATCH 5/8] Fix a clang-format issue. Fix bug #47589 --- debian/changelog | 6 ++++++ debian/patches/fix-clang-format-bug-47589.diff | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 20 insertions(+) create mode 100644 debian/patches/fix-clang-format-bug-47589.diff diff --git a/debian/changelog b/debian/changelog index 4f580c15..69cc806c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-11 (1:11.0.0-2) unstable; urgency=medium + + * Fix a clang-format issue. Fix bug #47589 + + -- Sylvestre Ledru Mon, 12 Oct 2020 15:15:27 +0200 + llvm-toolchain-11 (1:11.0.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/fix-clang-format-bug-47589.diff b/debian/patches/fix-clang-format-bug-47589.diff new file mode 100644 index 00000000..a0ad620f --- /dev/null +++ b/debian/patches/fix-clang-format-bug-47589.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-11-11.0.0/clang/lib/Format/UnwrappedLineParser.cpp +=================================================================== +--- llvm-toolchain-11-11.0.0.orig/clang/lib/Format/UnwrappedLineParser.cpp ++++ llvm-toolchain-11-11.0.0/clang/lib/Format/UnwrappedLineParser.cpp +@@ -3062,7 +3062,7 @@ void UnwrappedLineParser::pushToken(Form + Line->Tokens.push_back(UnwrappedLineNode(Tok)); + if (MustBreakBeforeNextToken) { + Line->Tokens.back().Tok->MustBreakBefore = true; +- Line->Tokens.back().Tok->MustBreakAlignBefore = true; ++// Line->Tokens.back().Tok->MustBreakAlignBefore = true; + MustBreakBeforeNextToken = false; + } + } diff --git a/debian/patches/series b/debian/patches/series index 2b9bdb58..92cf2f16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -137,3 +137,4 @@ disable-fuzzer-compiler-rt-x86.diff python3-shebang.patch print-lldb-path.patch libcxx-armhf-ftbfs.diff +fix-clang-format-bug-47589.diff From 292c1c818bc64616f83bfe2d584b98ba81e2f863 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 12 Oct 2020 15:15:40 +0200 Subject: [PATCH 6/8] Fix a clang-format issue. Fix bug #47589 --- .../patches/fix-clang-format-bug-47589.patch | 148 ++++++++++++++++++ debian/patches/series | 2 +- 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-clang-format-bug-47589.patch diff --git a/debian/patches/fix-clang-format-bug-47589.patch b/debian/patches/fix-clang-format-bug-47589.patch new file mode 100644 index 00000000..010c3339 --- /dev/null +++ b/debian/patches/fix-clang-format-bug-47589.patch @@ -0,0 +1,148 @@ +From 05860350084abdae30dfbd2181452d1b87dca3b4 Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Mon, 12 Oct 2020 18:47:30 +0200 +Subject: [PATCH] Revert "[clang-format] Fix AlignConsecutive on PP blocks" + +This reverts commit b2eb439317576ce718193763c12bff9fccdfc166. +--- + clang/lib/Format/FormatToken.h | 6 ----- + clang/lib/Format/UnwrappedLineParser.cpp | 2 -- + clang/lib/Format/WhitespaceManager.cpp | 10 +++----- + clang/unittests/Format/FormatTest.cpp | 23 ------------------- + clang/unittests/Format/FormatTestComments.cpp | 21 ----------------- + 5 files changed, 3 insertions(+), 59 deletions(-) + +diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h +index d4287f53fde..b132a3e84da 100644 +--- a/clang/lib/Format/FormatToken.h ++++ b/clang/lib/Format/FormatToken.h +@@ -183,12 +183,6 @@ struct FormatToken { + /// before the token. + bool MustBreakBefore = false; + +- /// Whether to not align across this token +- /// +- /// This happens for example when a preprocessor directive ended directly +- /// before the token, but very rarely otherwise. +- bool MustBreakAlignBefore = false; +- + /// The raw text of the token. + /// + /// Contains the raw token text without leading whitespace and without leading +diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp +index a37386425aa..ea8a41cfba8 100644 +--- a/clang/lib/Format/UnwrappedLineParser.cpp ++++ b/clang/lib/Format/UnwrappedLineParser.cpp +@@ -3037,7 +3037,6 @@ void UnwrappedLineParser::readToken(int LevelDifference) { + } + FormatTok = Tokens->getNextToken(); + FormatTok->MustBreakBefore = true; +- FormatTok->MustBreakAlignBefore = true; + } + + if (!PPStack.empty() && (PPStack.back().Kind == PP_Unreachable) && +@@ -3062,7 +3061,6 @@ void UnwrappedLineParser::pushToken(FormatToken *Tok) { + Line->Tokens.push_back(UnwrappedLineNode(Tok)); + if (MustBreakBeforeNextToken) { + Line->Tokens.back().Tok->MustBreakBefore = true; +- Line->Tokens.back().Tok->MustBreakAlignBefore = true; + MustBreakBeforeNextToken = false; + } + } +diff --git a/clang/lib/Format/WhitespaceManager.cpp b/clang/lib/Format/WhitespaceManager.cpp +index 32e0b685ea0..3a265bd0916 100644 +--- a/clang/lib/Format/WhitespaceManager.cpp ++++ b/clang/lib/Format/WhitespaceManager.cpp +@@ -411,11 +411,9 @@ static unsigned AlignTokens(const FormatStyle &Style, F &&Matches, + if (Changes[i].NewlinesBefore != 0) { + CommasBeforeMatch = 0; + EndOfSequence = i; +- // If there is a blank line, there is a forced-align-break (eg, +- // preprocessor), or if the last line didn't contain any matching token, +- // the sequence ends here. +- if (Changes[i].NewlinesBefore > 1 || +- Changes[i].Tok->MustBreakAlignBefore || !FoundMatchOnLine) ++ // If there is a blank line, or if the last line didn't contain any ++ // matching token, the sequence ends here. ++ if (Changes[i].NewlinesBefore > 1 || !FoundMatchOnLine) + AlignCurrentSequence(); + + FoundMatchOnLine = false; +@@ -726,8 +724,6 @@ void WhitespaceManager::alignTrailingComments() { + if (Changes[i].StartOfBlockComment) + continue; + Newlines += Changes[i].NewlinesBefore; +- if (Changes[i].Tok->MustBreakAlignBefore) +- BreakBeforeNext = true; + if (!Changes[i].IsTrailingComment) + continue; + +diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp +index 17d302f0b65..7e4d1fca509 100644 +--- a/clang/unittests/Format/FormatTest.cpp ++++ b/clang/unittests/Format/FormatTest.cpp +@@ -11968,29 +11968,6 @@ TEST_F(FormatTest, AlignConsecutiveAssignments) { + verifyFormat("int oneTwoThree = 123; // comment\n" + "int oneTwo = 12; // comment", + Alignment); +- +- // Bug 25167 +- verifyFormat("#if A\n" +- "#else\n" +- "int aaaaaaaa = 12;\n" +- "#endif\n" +- "#if B\n" +- "#else\n" +- "int a = 12;\n" +- "#endif\n", +- Alignment); +- verifyFormat("enum foo {\n" +- "#if A\n" +- "#else\n" +- " aaaaaaaa = 12;\n" +- "#endif\n" +- "#if B\n" +- "#else\n" +- " a = 12;\n" +- "#endif\n" +- "};\n", +- Alignment); +- + EXPECT_EQ("int a = 5;\n" + "\n" + "int oneTwoThree = 123;", +diff --git a/clang/unittests/Format/FormatTestComments.cpp b/clang/unittests/Format/FormatTestComments.cpp +index 47509f29744..d5b9f8e0885 100644 +--- a/clang/unittests/Format/FormatTestComments.cpp ++++ b/clang/unittests/Format/FormatTestComments.cpp +@@ -2780,27 +2780,6 @@ TEST_F(FormatTestComments, AlignTrailingComments) { + " // line 2 about b\n" + " long b;", + getLLVMStyleWithColumns(80))); +- +- // Checks an edge case in preprocessor handling. +- // These comments should *not* be aligned +- EXPECT_EQ( +- "#if FOO\n" +- "#else\n" +- "long a; // Line about a\n" +- "#endif\n" +- "#if BAR\n" +- "#else\n" +- "long b_long_name; // Line about b\n" +- "#endif\n", +- format("#if FOO\n" +- "#else\n" +- "long a; // Line about a\n" // Previous (bad) behavior +- "#endif\n" +- "#if BAR\n" +- "#else\n" +- "long b_long_name; // Line about b\n" +- "#endif\n", +- getLLVMStyleWithColumns(80))); + } + + TEST_F(FormatTestComments, AlignsBlockCommentDecorations) { +-- +2.28.0 + diff --git a/debian/patches/series b/debian/patches/series index 92cf2f16..cc2a92d2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -137,4 +137,4 @@ disable-fuzzer-compiler-rt-x86.diff python3-shebang.patch print-lldb-path.patch libcxx-armhf-ftbfs.diff -fix-clang-format-bug-47589.diff +fix-clang-format-bug-47589.patch From f93c8a5d15cf39e4ebc2e380c5d5e377dc0eb2e1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 13 Oct 2020 09:21:57 +0200 Subject: [PATCH 7/8] remove artifact --- debian/patches/fix-clang-format-bug-47589.diff | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 debian/patches/fix-clang-format-bug-47589.diff diff --git a/debian/patches/fix-clang-format-bug-47589.diff b/debian/patches/fix-clang-format-bug-47589.diff deleted file mode 100644 index a0ad620f..00000000 --- a/debian/patches/fix-clang-format-bug-47589.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-11-11.0.0/clang/lib/Format/UnwrappedLineParser.cpp -=================================================================== ---- llvm-toolchain-11-11.0.0.orig/clang/lib/Format/UnwrappedLineParser.cpp -+++ llvm-toolchain-11-11.0.0/clang/lib/Format/UnwrappedLineParser.cpp -@@ -3062,7 +3062,7 @@ void UnwrappedLineParser::pushToken(Form - Line->Tokens.push_back(UnwrappedLineNode(Tok)); - if (MustBreakBeforeNextToken) { - Line->Tokens.back().Tok->MustBreakBefore = true; -- Line->Tokens.back().Tok->MustBreakAlignBefore = true; -+// Line->Tokens.back().Tok->MustBreakAlignBefore = true; - MustBreakBeforeNextToken = false; - } - } From 248fa4019ec4af45d199399673407894efdd15b4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 17 Oct 2020 10:02:54 +0200 Subject: [PATCH 8/8] Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP. Changes-By: lintian-brush Fixes: lintian: uses-deprecated-adttmp See-also: https://lintian.debian.org/tags/uses-deprecated-adttmp.html --- debian/changelog | 4 ++++ debian/tests/cmake-test | 8 ++++---- debian/tests/integration-test-suite-test | 10 +++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index c936714d..ed8b04ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-10 (1:10.0.1-7) UNRELEASED; urgency=medium + [ Samuel Thibault ] * debian/patches/hurd/hurd-cxx-paths.diff: Add missing GCC installation initialization. + [ Sylvestre Ledru ] + * Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP. + -- Samuel Thibault Thu, 27 Aug 2020 17:06:44 +0200 llvm-toolchain-10 (1:10.0.1-6) unstable; urgency=medium diff --git a/debian/tests/cmake-test b/debian/tests/cmake-test index 97f8bb2c..68849661 100755 --- a/debian/tests/cmake-test +++ b/debian/tests/cmake-test @@ -3,18 +3,18 @@ set -e # this is taken from libjsoncpp package -# Presence of $ADTTMP implies that someone will handle cleanup for us, so we +# Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we # can avoid duplicating the effort (signal handling, etc.) here. -if [ -z "$ADTTMP" ] +if [ -z "$AUTOPKGTEST_TMP" ] then - echo "Required envvar ADTTMP \"$ADTTMP\" is not set" >&2 + echo "Required envvar AUTOPKGTEST_TMP \"$AUTOPKGTEST_TMP\" is not set" >&2 exit 1 fi # the idea was taken from spirv-llvm-translator package -cd "$ADTTMP" +cd "$AUTOPKGTEST_TMP" cat < CMakeLists.txt cmake_minimum_required(VERSION 2.6.2) project(cmake-test) diff --git a/debian/tests/integration-test-suite-test b/debian/tests/integration-test-suite-test index 328c0edc..62fd2ac4 100755 --- a/debian/tests/integration-test-suite-test +++ b/debian/tests/integration-test-suite-test @@ -5,17 +5,17 @@ set -e LLVM_VERSION=10 # this is taken from libjsoncpp package -# Presence of $ADTTMP implies that someone will handle cleanup for us, so we +# Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we # can avoid duplicating the effort (signal handling, etc.) here. -if [ -z "$ADTTMP" ] +if [ -z "$AUTOPKGTEST_TMP" ] then - echo "Required envvar ADTTMP \"$ADTTMP\" is not set" >&2 + echo "Required envvar AUTOPKGTEST_TMP \"$AUTOPKGTEST_TMP\" is not set" >&2 exit 1 fi # Copy the integration repo to the temp dir -cp -Rv integration-test-suite/* "$ADTTMP"/ -cd "$ADTTMP" +cp -Rv integration-test-suite/* "$AUTOPKGTEST_TMP"/ +cd "$AUTOPKGTEST_TMP" mkdir build cd build