Date: Monday, March 25, 2019 @ 22:42:13 Author: foutrelis Revision: 349192
upgpkg: llvm 8.0.0-1 New upstream release. Modified: llvm/trunk/PKGBUILD Deleted: llvm/trunk/add-discriminator-to-debuginfo-test.patch llvm/trunk/rusty-discriminator-thingy.patch -------------------------------------------+ PKGBUILD | 20 ++------- add-discriminator-to-debuginfo-test.patch | 25 ------------ rusty-discriminator-thingy.patch | 57 ---------------------------- 3 files changed, 6 insertions(+), 96 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-25 21:56:58 UTC (rev 349191) +++ PKGBUILD 2019-03-25 22:42:13 UTC (rev 349192) @@ -2,23 +2,20 @@ # Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> pkgname=('llvm' 'llvm-libs' 'llvm-ocaml') -pkgver=7.0.1 -pkgrel=2 +pkgver=8.0.0 +pkgrel=1 _ocaml_ver=4.07.1 arch=('x86_64') url="https://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2' 'python-sphinx' - "ocaml=$_ocaml_ver" 'ocaml-ctypes' 'ocaml-findlib') +makedepends=('cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2' + "ocaml=$_ocaml_ver" 'ocaml-ctypes' 'ocaml-findlib' + 'python-sphinx' 'python-recommonmark') options=('staticlibs') source=(https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig} - rusty-discriminator-thingy.patch - add-discriminator-to-debuginfo-test.patch llvm-config.h) -sha256sums=('a38dfc4db47102ec79dcc2aa61e93722c5f6f06f0a961073bd84b78fb949419b' +sha256sums=('8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c' 'SKIP' - '4abaef845abb899628deb62a3f184fb8433555620648150dc346a74ef134fd68' - '1d2ea3a07e94f4c826706a452e93ed8a2301b5eed5715d22eab19a5ea3f3d0a7' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstel...@redhat.com> @@ -26,11 +23,6 @@ prepare() { cd "$srcdir/llvm-$pkgver.src" mkdir build - - # Fix rust 1.32 segfaults with LTO being enabled - # https://github.com/rust-lang/rust/issues/54614 - patch -Np1 -i ../rusty-discriminator-thingy.patch - patch -Np1 -i ../add-discriminator-to-debuginfo-test.patch } build() { Deleted: add-discriminator-to-debuginfo-test.patch =================================================================== --- add-discriminator-to-debuginfo-test.patch 2019-03-25 21:56:58 UTC (rev 349191) +++ add-discriminator-to-debuginfo-test.patch 2019-03-25 22:42:13 UTC (rev 349192) @@ -1,25 +0,0 @@ -From cc1f2a595ead516812a6c50398f0f3480ebe031f Mon Sep 17 00:00:00 2001 -From: Jonas Devlieghere <jo...@devlieghere.com> -Date: Fri, 21 Sep 2018 12:28:44 +0000 -Subject: [PATCH] [test] Fix Assembler/debug-info.ll - -Update Assembler/debug-info.ll to contain discriminator. - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342727 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - test/Assembler/debug-info.ll | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/Assembler/debug-info.ll b/test/Assembler/debug-info.ll -index 4404b741d343..d54dba07ac1e 100644 ---- a/test/Assembler/debug-info.ll -+++ b/test/Assembler/debug-info.ll -@@ -83,7 +83,7 @@ - ; CHECK-NEXT: !32 = !DIFile(filename: "file", directory: "dir", checksumkind: CSK_MD5, checksum: "000102030405060708090a0b0c0d0e0f") - !35 = !DIFile(filename: "file", directory: "dir", checksumkind: CSK_MD5, checksum: "000102030405060708090a0b0c0d0e0f") - --; CHECK-NEXT: !33 = !DICompositeType(tag: DW_TAG_variant_part, name: "A", scope: !14, size: 64) -+; CHECK-NEXT: !33 = !DICompositeType(tag: DW_TAG_variant_part, name: "A", scope: !14, size: 64, discriminator: !34) - ; CHECK-NEXT: !34 = !DIDerivedType(tag: DW_TAG_member, scope: !33, baseType: !35, size: 64, align: 64, flags: DIFlagArtificial) - ; CHECK-NEXT: !35 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned) - !36 = !DICompositeType(tag: DW_TAG_variant_part, name: "A", scope: !16, size: 64, discriminator: !37) Deleted: rusty-discriminator-thingy.patch =================================================================== --- rusty-discriminator-thingy.patch 2019-03-25 21:56:58 UTC (rev 349191) +++ rusty-discriminator-thingy.patch 2019-03-25 22:42:13 UTC (rev 349192) @@ -1,57 +0,0 @@ -From da1fb72bb305d6bc1f3899d541414146934bf80f Mon Sep 17 00:00:00 2001 -From: Jonas Devlieghere <jo...@devlieghere.com> -Date: Fri, 21 Sep 2018 12:03:14 +0000 -Subject: [PATCH] Ensure that variant part discriminator is read by - MetadataLoader - -https://reviews.llvm.org/D42082 introduced variant parts to debug info -in LLVM. Subsequent work on the Rust compiler has found a bug in that -patch; namely, there is a path in MetadataLoader that fails to restore -the discriminator. - -This patch fixes the bug. - -Patch by: Tom Tromey - -Differential revision: https://reviews.llvm.org/D52340 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342725 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Bitcode/Reader/MetadataLoader.cpp | 2 +- - test/Assembler/debug-variant-discriminator.ll | 14 ++++++++++++++ - 2 files changed, 15 insertions(+), 1 deletion(-) - create mode 100644 test/Assembler/debug-variant-discriminator.ll - -diff --git a/lib/Bitcode/Reader/MetadataLoader.cpp b/lib/Bitcode/Reader/MetadataLoader.cpp -index 3fe7d2205631..4781cfe3dea6 100644 ---- a/lib/Bitcode/Reader/MetadataLoader.cpp -+++ b/lib/Bitcode/Reader/MetadataLoader.cpp -@@ -1313,7 +1313,7 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata( - (Context, Tag, Name, File, Line, Scope, BaseType, - SizeInBits, AlignInBits, OffsetInBits, Flags, - Elements, RuntimeLang, VTableHolder, TemplateParams, -- Identifier)); -+ Identifier, Discriminator)); - if (!IsNotUsedInTypeRef && Identifier) - MetadataList.addTypeRef(*Identifier, *cast<DICompositeType>(CT)); - -diff --git a/test/Assembler/debug-variant-discriminator.ll b/test/Assembler/debug-variant-discriminator.ll -new file mode 100644 -index 000000000000..5be001cad6be ---- /dev/null -+++ b/test/Assembler/debug-variant-discriminator.ll -@@ -0,0 +1,14 @@ -+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s -+; RUN: verify-uselistorder %s -+ -+; CHECK: !named = !{!0, !1, !2} -+!named = !{!0, !1, !2} -+ -+; CHECK: !0 = !DICompositeType(tag: DW_TAG_structure_type, name: "Outer", size: 64, align: 64, identifier: "Outer") -+; CHECK-NEXT: !1 = !DICompositeType(tag: DW_TAG_variant_part, scope: !0, size: 64, discriminator: !2) -+; CHECK-NEXT: !2 = !DIDerivedType(tag: DW_TAG_member, scope: !1, baseType: !3, size: 64, align: 64, flags: DIFlagArtificial) -+; CHECK-NEXT: !3 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned) -+!0 = !DICompositeType(tag: DW_TAG_structure_type, name: "Outer", size: 64, align: 64, identifier: "Outer") -+!1 = !DICompositeType(tag: DW_TAG_variant_part, scope: !0, size: 64, discriminator: !2) -+!2 = !DIDerivedType(tag: DW_TAG_member, scope: !1, baseType: !3, size: 64, align: 64, flags: DIFlagArtificial) -+!3 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned)