From 481c87563ebf678d40de6eaf7e8ebdfc088fb641 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 30 Apr 2024 15:10:20 +0000 Subject: [PATCH] import UBI clang-17.0.6-5.el9 --- .clang.metadata | 8 +- .gitignore | 8 +- ...Change-LLVM_COMMON_CMAKE_UTILS-usage.patch | 30 -- ...equivalent-triple-to-the-list-of-tr.patch} | 13 +- ...funwind-tables-the-default-on-all-a.patch} | 17 +- ...h => 0001-Produce-DWARF4-by-default.patch} | 54 ++-- ...1-Workaround-a-bug-in-ORC-on-ppc64le.patch | 30 ++ ...a-Make-test-dependency-on-LLVMHello-.patch | 18 +- ...lang-Don-t-install-static-libraries.patch} | 10 +- SOURCES/0009-disable-recommonmark.patch | 48 ++- SOURCES/D138472.diff | 53 ---- SOURCES/D141581.diff | 25 -- SOURCES/cfg.patch | 298 ++++++++++++++++++ SOURCES/fix-ieee128-cross.diff | 16 - SOURCES/macros.clang | 7 +- SOURCES/tsa.patch | 124 ++++++++ SPECS/clang.spec | 216 +++++++++---- 17 files changed, 686 insertions(+), 289 deletions(-) delete mode 100644 SOURCES/0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch rename SOURCES/{0002-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch => 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch} (87%) rename SOURCES/{0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch => 0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch} (61%) rename SOURCES/{0010-PATCH-clang-Produce-DWARF4-by-default.patch => 0001-Produce-DWARF4-by-default.patch} (78%) create mode 100644 SOURCES/0001-Workaround-a-bug-in-ORC-on-ppc64le.patch rename SOURCES/{0006-Don-t-install-static-libraries.patch => 0003-PATCH-clang-Don-t-install-static-libraries.patch} (77%) delete mode 100644 SOURCES/D138472.diff delete mode 100644 SOURCES/D141581.diff create mode 100644 SOURCES/cfg.patch delete mode 100644 SOURCES/fix-ieee128-cross.diff create mode 100644 SOURCES/tsa.patch diff --git a/.clang.metadata b/.clang.metadata index 7ea9781..eb62fca 100644 --- a/.clang.metadata +++ b/.clang.metadata @@ -1,4 +1,4 @@ -f005e3b6d41cf92c083d2a16960aaeb1a6e3c76c SOURCES/clang-16.0.6.src.tar.xz -bc19124e64c0ffe7ada3d4bad8aec42c0cd05f04 SOURCES/clang-16.0.6.src.tar.xz.sig -41c06d541cfcc126ddc344e7f162148f2ecf0461 SOURCES/clang-tools-extra-16.0.6.src.tar.xz -cc29485778a6c94ed98f3b2dfb754ef513535691 SOURCES/clang-tools-extra-16.0.6.src.tar.xz.sig +2822ff10a016df1fffdeb296f753e9c5fce764ee SOURCES/clang-17.0.6.src.tar.xz +576ef9aeccf3febe1828c68b3e11ffa921f3fc92 SOURCES/clang-17.0.6.src.tar.xz.sig +1ec17cc98c397d6b4d30f57f14646fa085c9ccce SOURCES/clang-tools-extra-17.0.6.src.tar.xz +cba7dea96b093d9989ceb949a21b4180b9d9985e SOURCES/clang-tools-extra-17.0.6.src.tar.xz.sig diff --git a/.gitignore b/.gitignore index 56ee08a..a7c012d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/clang-16.0.6.src.tar.xz -SOURCES/clang-16.0.6.src.tar.xz.sig -SOURCES/clang-tools-extra-16.0.6.src.tar.xz -SOURCES/clang-tools-extra-16.0.6.src.tar.xz.sig +SOURCES/clang-17.0.6.src.tar.xz +SOURCES/clang-17.0.6.src.tar.xz.sig +SOURCES/clang-tools-extra-17.0.6.src.tar.xz +SOURCES/clang-tools-extra-17.0.6.src.tar.xz.sig diff --git a/SOURCES/0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch b/SOURCES/0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch deleted file mode 100644 index d330f87..0000000 --- a/SOURCES/0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2a0175c88ccd8c162901ac0ade56859d2b599f38 Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Mon, 17 Apr 2023 16:19:04 +0200 -Subject: [PATCH] Change LLVM_COMMON_CMAKE_UTILS usage - -Let LLVM_COMMON_CMAKE_UTILS store the directory where cmake modules are -available and stop assuming its directory structure. ---- - clang/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt -index 1fff005d6525..f4b3ef4bd15a 100644 ---- a/clang/CMakeLists.txt -+++ b/clang/CMakeLists.txt -@@ -1,9 +1,9 @@ - cmake_minimum_required(VERSION 3.13.4) - - if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) -- set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) -+ set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules) - endif() --include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake -+include(${LLVM_COMMON_CMAKE_UTILS}/CMakePolicy.cmake - NO_POLICY_SCOPE) - - # If we are not building as a part of LLVM, build Clang as an --- -2.39.2 - diff --git a/SOURCES/0002-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch b/SOURCES/0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch similarity index 87% rename from SOURCES/0002-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch rename to SOURCES/0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch index ece7e39..6c94b4d 100644 --- a/SOURCES/0002-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch +++ b/SOURCES/0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch @@ -1,7 +1,8 @@ -From ccf3e4407e7a5c4c1f2e41c89aad9f86a9c7d81d Mon Sep 17 00:00:00 2001 +From d68a5a7817dc0d43853d8b84c9185dc24338664f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Oct 2021 05:32:44 +0000 -Subject: Driver: Add a gcc equivalent triple to the list of triples to search +Subject: [PATCH] Driver: Add a gcc equivalent triple to the list of triples to + search There are some gcc triples, like x86_64-redhat-linux, that provide the same behavior as a clang triple with a similar name (e.g. @@ -14,10 +15,10 @@ Differential Revision: https://reviews.llvm.org/D111207 1 file changed, 22 insertions(+) diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp -index f203cae1d329..12fa2da3187e 100644 +index fe5bda5c6605..fd4a7f72be14 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp -@@ -1969,6 +1969,18 @@ static llvm::StringRef getGCCToolchainDir(const ArgList &Args, +@@ -1884,6 +1884,18 @@ static llvm::StringRef getGCCToolchainDir(const ArgList &Args, return GCC_INSTALL_PREFIX; } @@ -36,7 +37,7 @@ index f203cae1d329..12fa2da3187e 100644 /// Initialize a GCCInstallationDetector from the driver. /// /// This performs all of the autodetection and sets up the various paths. -@@ -1989,6 +2001,16 @@ void Generic_GCC::GCCInstallationDetector::init( +@@ -1904,6 +1916,16 @@ void Generic_GCC::GCCInstallationDetector::init( // The compatible GCC triples for this particular architecture. SmallVector CandidateTripleAliases; SmallVector CandidateBiarchTripleAliases; @@ -54,5 +55,5 @@ index f203cae1d329..12fa2da3187e 100644 CandidateTripleAliases, CandidateBiarchLibDirs, CandidateBiarchTripleAliases); -- -2.37.1 +2.26.2 diff --git a/SOURCES/0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch b/SOURCES/0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch similarity index 61% rename from SOURCES/0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch rename to SOURCES/0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch index ce920f9..113f2a7 100644 --- a/SOURCES/0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch +++ b/SOURCES/0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch @@ -1,21 +1,20 @@ -From d95d3fbff661c0390072ed0bb4544d5e2aae5c9a Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Thu, 25 Feb 2021 14:09:29 +0100 +From 49f827b09db549de62dcaf8b90b3fcb3e08c0ee5 Mon Sep 17 00:00:00 2001 +From: Serge Guelton +Date: Mon, 6 Mar 2023 12:37:48 +0100 Subject: [PATCH] Make -funwind-tables the default on all archs --- - clang/lib/Driver/ToolChains/Gnu.cpp | 5 +++++ - 1 file changed, 5 insertions(+) + clang/lib/Driver/ToolChains/Gnu.cpp | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp -index c8006f3d8412..6ed03adb7702 100644 +index 24fbdcffc07b..8fed46b49515 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp -@@ -2863,6 +2863,11 @@ Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const { - case llvm::Triple::ppc64le: +@@ -2904,6 +2904,10 @@ Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const { + case llvm::Triple::riscv64: case llvm::Triple::x86: case llvm::Triple::x86_64: -+ + // Enable -funwind-tables on all architectures supported by Fedora: + // rhbz#1655546 + case llvm::Triple::systemz: diff --git a/SOURCES/0010-PATCH-clang-Produce-DWARF4-by-default.patch b/SOURCES/0001-Produce-DWARF4-by-default.patch similarity index 78% rename from SOURCES/0010-PATCH-clang-Produce-DWARF4-by-default.patch rename to SOURCES/0001-Produce-DWARF4-by-default.patch index ea81f74..9b5b46b 100644 --- a/SOURCES/0010-PATCH-clang-Produce-DWARF4-by-default.patch +++ b/SOURCES/0001-Produce-DWARF4-by-default.patch @@ -1,36 +1,38 @@ -From 4ea62faaaac1aad0fe496cabe9674c809c91c49a Mon Sep 17 00:00:00 2001 +From adbe188f3b1e3a0dd5ec80d9409601ba7f5b0423 Mon Sep 17 00:00:00 2001 From: Konrad Kleine -Date: Mon, 13 Feb 2023 17:11:00 -0300 +Date: Thu, 24 Mar 2022 09:44:21 +0100 Subject: [PATCH] Produce DWARF4 by default Have a look at the following commit to see when the move from DWARF 4 to 5 first happened upstream: https://github.com/llvm/llvm-project/commit/d3b26dea16108c427b19b5480c9edc76edf8f5b4?diff=unified --- - clang/include/clang/Driver/ToolChain.h | 2 +- - clang/test/CodeGen/dwarf-version.c | 4 ++-- - clang/test/Driver/as-options.s | 4 ++-- - clang/test/Driver/cl-options.c | 2 +- - clang/test/Driver/clang-g-opts.c | 2 +- - clang/test/Driver/ve-toolchain.c | 2 +- - clang/test/Driver/ve-toolchain.cpp | 2 +- - 7 files changed, 9 insertions(+), 9 deletions(-) + clang/lib/Driver/ToolChain.cpp | 4 +--- + clang/test/CodeGen/dwarf-version.c | 4 ++-- + clang/test/Driver/as-options.s | 4 ++-- + clang/test/Driver/cl-options.c | 2 +- + clang/test/Driver/clang-g-opts.c | 2 +- + clang/test/Driver/ve-toolchain.c | 2 +- + clang/test/Driver/ve-toolchain.cpp | 2 +- + 7 files changed, 9 insertions(+), 11 deletions(-) -diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h -index f75f35dc9e65..a70ae2b17833 100644 ---- a/clang/include/clang/Driver/ToolChain.h -+++ b/clang/include/clang/Driver/ToolChain.h -@@ -547,7 +547,7 @@ public: +diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp +index 8dafc3d481c2..92bf26dc8ec6 100644 +--- a/clang/lib/Driver/ToolChain.cpp ++++ b/clang/lib/Driver/ToolChain.cpp +@@ -428,9 +428,7 @@ ToolChain::getDefaultUnwindTableLevel(const ArgList &Args) const { + } - // Return the DWARF version to emit, in the absence of arguments - // to the contrary. -- virtual unsigned GetDefaultDwarfVersion() const { return 5; } -+ virtual unsigned GetDefaultDwarfVersion() const { return 4; } + unsigned ToolChain::GetDefaultDwarfVersion() const { +- // TODO: Remove the RISC-V special case when R_RISCV_SET_ULEB128 linker +- // support becomes more widely available. +- return getTriple().isRISCV() ? 4 : 5; ++ return 4; + } - // Some toolchains may have different restrictions on the DWARF version and - // may need to adjust it. E.g. NVPTX may need to enforce DWARF2 even when host + Tool *ToolChain::getClang() const { diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c -index 0a6fa4768026..96f01749d0d8 100644 +index d307eb3f101f..e7e93bf6688c 100644 --- a/clang/test/CodeGen/dwarf-version.c +++ b/clang/test/CodeGen/dwarf-version.c @@ -2,8 +2,8 @@ @@ -67,10 +69,10 @@ index 73d002c7ef7e..71d55f7fd537 100644 // RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-5 %s -### 2>&1 | \ // RUN: FileCheck --check-prefix=GDWARF5 %s diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c -index 1d588bdfc1b0..1ad57aedc3a4 100644 +index 6d929b19e7e2..373905c2e0fc 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c -@@ -575,7 +575,7 @@ +@@ -569,7 +569,7 @@ // RUN: %clang_cl /Z7 -gdwarf /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s // Z7_gdwarf: "-gcodeview" // Z7_gdwarf: "-debug-info-kind=constructor" @@ -80,7 +82,7 @@ index 1d588bdfc1b0..1ad57aedc3a4 100644 // RUN: %clang_cl /ZH:MD5 /c -### -- %s 2>&1 | FileCheck -check-prefix=ZH_MD5 %s // ZH_MD5: "-gsrc-hash=md5" diff --git a/clang/test/Driver/clang-g-opts.c b/clang/test/Driver/clang-g-opts.c -index d982b1070cae..bb129e75769c 100644 +index 5ee0fe64fe48..985158746137 100644 --- a/clang/test/Driver/clang-g-opts.c +++ b/clang/test/Driver/clang-g-opts.c @@ -32,7 +32,7 @@ @@ -119,5 +121,5 @@ index 5a33d5eceb61..cedf895b36dc 100644 ///----------------------------------------------------------------------------- /// Checking include-path -- -2.39.1 +2.41.0 diff --git a/SOURCES/0001-Workaround-a-bug-in-ORC-on-ppc64le.patch b/SOURCES/0001-Workaround-a-bug-in-ORC-on-ppc64le.patch new file mode 100644 index 0000000..af236a1 --- /dev/null +++ b/SOURCES/0001-Workaround-a-bug-in-ORC-on-ppc64le.patch @@ -0,0 +1,30 @@ +From a2449cee8c995b56f1892502aab3dfad3d6f3ca1 Mon Sep 17 00:00:00 2001 +From: Tulio Magno Quites Machado Filho +Date: Fri, 8 Sep 2023 11:45:34 -0300 +Subject: [PATCH] Workaround a bug in ORC on ppc64le + +The Jit code appears to be returning the wrong printf symbol on ppc64le +after the transition of the default long double to IEEE 128-bit floating +point. +--- + clang/unittests/Interpreter/InterpreterTest.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/clang/unittests/Interpreter/InterpreterTest.cpp b/clang/unittests/Interpreter/InterpreterTest.cpp +index abb8e6377aab..7b6697ebc6ed 100644 +--- a/clang/unittests/Interpreter/InterpreterTest.cpp ++++ b/clang/unittests/Interpreter/InterpreterTest.cpp +@@ -243,7 +243,9 @@ TEST(IncrementalProcessing, FindMangledNameSymbol) { + EXPECT_FALSE(!Addr); + + // FIXME: Re-enable when we investigate the way we handle dllimports on Win. +-#ifndef _WIN32 ++ // FIXME: The printf symbol returned from the Jit may not be correct on ++ // ppc64le when the default long double is IEEE 128-bit fp. ++#if !defined _WIN32 && !(defined __PPC64__ && defined __LITTLE_ENDIAN__) + EXPECT_EQ((uintptr_t)&printf, Addr->getValue()); + #endif // _WIN32 + } +-- +2.41.0 + diff --git a/SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch b/SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch index a0b8cb0..b69c7e7 100644 --- a/SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch +++ b/SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch @@ -1,6 +1,6 @@ -From 581300e447602b9b7a505b0f07e8461d58d041ca Mon Sep 17 00:00:00 2001 +From 22d62b32cd3be5fb0ae10723b35a781e0f862b71 Mon Sep 17 00:00:00 2001 From: Tom Stellard -Date: Fri, 1 Jul 2022 21:24:17 -0700 +Date: Tue, 24 Jan 2023 22:46:25 +0000 Subject: [PATCH] clang-tools-extra: Make test dependency on LLVMHello optional This fixes clang + clang-tools-extra standalone build after @@ -55,19 +55,19 @@ index c66a94f458cf..b4e7a5d691e5 100644 // CHECK-LIST: Enabled checks: // CHECK-LIST-NEXT: mytest1 diff --git a/clang-tools-extra/test/lit.cfg.py b/clang-tools-extra/test/lit.cfg.py -index 9b99bfd93440..3fca9f25fb48 100644 +index 9f64fd3d2ffa..1b258a00ddf9 100644 --- a/clang-tools-extra/test/lit.cfg.py +++ b/clang-tools-extra/test/lit.cfg.py -@@ -59,6 +59,9 @@ config.substitutions.append( - # Plugins (loadable modules) +@@ -75,6 +75,9 @@ config.substitutions.append(("%clang_tidy_headers", clang_tidy_headers)) if config.has_plugins and config.llvm_plugin_ext: - config.available_features.add('plugins') -+ + config.available_features.add("plugins") + +if config.has_llvm_hello: + config.available_features.add("llvm-hello") - ++ # It is not realistically possible to account for all options that could # possibly be present in system and user configuration files, so disable + # default configs for the test runs. diff --git a/clang-tools-extra/test/lit.site.cfg.py.in b/clang-tools-extra/test/lit.site.cfg.py.in index 4eb830a1baf1..6e5559348454 100644 --- a/clang-tools-extra/test/lit.site.cfg.py.in @@ -81,5 +81,5 @@ index 4eb830a1baf1..6e5559348454 100644 # used when we can't determine the tool dir at configuration time. config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@") -- -2.27.0 +2.40.1 diff --git a/SOURCES/0006-Don-t-install-static-libraries.patch b/SOURCES/0003-PATCH-clang-Don-t-install-static-libraries.patch similarity index 77% rename from SOURCES/0006-Don-t-install-static-libraries.patch rename to SOURCES/0003-PATCH-clang-Don-t-install-static-libraries.patch index 175c186..bc8fa51 100644 --- a/SOURCES/0006-Don-t-install-static-libraries.patch +++ b/SOURCES/0003-PATCH-clang-Don-t-install-static-libraries.patch @@ -1,17 +1,17 @@ -From 6e0c48576740a1da9abeecfb8070127b8e91ab73 Mon Sep 17 00:00:00 2001 +From 88704fc2eabb9dd19a9c3eb81a9b3dc37d95651c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 31 Jan 2020 11:04:57 -0800 -Subject: Don't install static libraries +Subject: [PATCH][clang] Don't install static libraries --- clang/cmake/modules/AddClang.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake -index 21ac332e4f5f..d0cf20cced21 100644 +index 5752f4277444..0f52822d91f0 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake -@@ -114,7 +114,7 @@ macro(add_clang_library name) +@@ -113,7 +113,7 @@ macro(add_clang_library name) if(TARGET ${lib}) target_link_libraries(${lib} INTERFACE ${LLVM_COMMON_LIBS}) @@ -21,5 +21,5 @@ index 21ac332e4f5f..d0cf20cced21 100644 install(TARGETS ${lib} COMPONENT ${lib} -- -2.37.1 +2.30.2 diff --git a/SOURCES/0009-disable-recommonmark.patch b/SOURCES/0009-disable-recommonmark.patch index 8a259af..f6db5da 100644 --- a/SOURCES/0009-disable-recommonmark.patch +++ b/SOURCES/0009-disable-recommonmark.patch @@ -1,38 +1,26 @@ -From f4e2d711e5cfd8e357d770e2da7a114086ee8659 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timm=20B=C3=A4der?= -Date: Thu, 22 Sep 2022 10:49:43 +0200 -Subject: disable recommonmark - ---- - clang/docs/conf.py | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/clang/docs/conf.py b/clang/docs/conf.py -index b8a42018191a..912449a7f792 100644 ---- a/clang/docs/conf.py -+++ b/clang/docs/conf.py -@@ -37,20 +37,7 @@ source_suffix = { - '.rst': 'restructuredtext', +diff -Naur a/clang/docs/conf.py b/clang/docs/conf.py +--- a/clang/docs/conf.py 2020-09-15 09:12:24.318287611 +0000 ++++ b/clang/docs/conf.py 2020-09-15 15:01:00.025893199 +0000 +@@ -37,21 +37,7 @@ + ".rst": "restructuredtext", } -try: -- import recommonmark +- import recommonmark -except ImportError: -- # manpages do not use any .md sources -- if not tags.has('builder-man'): -- raise +- # manpages do not use any .md sources +- if not tags.has("builder-man"): +- raise -else: -- import sphinx -- if sphinx.version_info >= (3, 0): -- # This requires 0.5 or later. -- extensions.append('recommonmark') -- else: -- source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'} -- source_suffix['.md'] = 'markdown' +- import sphinx +- +- if sphinx.version_info >= (3, 0): +- # This requires 0.5 or later. +- extensions.append("recommonmark") +- else: +- source_parsers = {".md": "recommonmark.parser.CommonMarkParser"} +- source_suffix[".md"] = "markdown" +import sphinx # The encoding of source files. - #source_encoding = 'utf-8-sig' --- -2.37.1 - + # source_encoding = 'utf-8-sig' diff --git a/SOURCES/D138472.diff b/SOURCES/D138472.diff deleted file mode 100644 index 5d3cd60..0000000 --- a/SOURCES/D138472.diff +++ /dev/null @@ -1,53 +0,0 @@ -From 04b642c646048dd9df652eba05d45beaa13bc895 Mon Sep 17 00:00:00 2001 -From: Konrad Kleine -Date: Mon, 23 Jan 2023 13:14:17 +0000 -Subject: [PATCH] Rebased D138472 - ---- - clang/CMakeLists.txt | 23 ++++++++++------------- - 1 file changed, 10 insertions(+), 13 deletions(-) - -diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt -index 090cfa352078..f87838776c32 100644 ---- a/clang/CMakeLists.txt -+++ b/clang/CMakeLists.txt -@@ -118,12 +118,11 @@ if(CLANG_BUILT_STANDALONE) - set(LLVM_UTILS_PROVIDED ON) - set(CLANG_TEST_DEPS FileCheck count not) - endif() -- set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest) -- if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h -- AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} -- AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt) -- add_subdirectory(${UNITTEST_DIR} third-party/unittest) -- endif() -+ endif() -+ -+ find_package(LLVMGTest HINTS "${LLVM_CMAKE_DIR}") -+ if (NOT TARGET llvm_gtest) -+ message(FATAL_ERROR "llvm-gtest not found. Please install llvm-gtest or disable tests with -DLLVM_INCLUDE_TESTS=OFF") - endif() - - if(LLVM_LIT) -@@ -506,13 +505,11 @@ endif() - - - if( CLANG_INCLUDE_TESTS ) -- if(EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h) -- add_subdirectory(unittests) -- list(APPEND CLANG_TEST_DEPS ClangUnitTests) -- list(APPEND CLANG_TEST_PARAMS -- clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/test/Unit/lit.site.cfg -- ) -- endif() -+ add_subdirectory(unittests) -+ list(APPEND CLANG_TEST_DEPS ClangUnitTests) -+ list(APPEND CLANG_TEST_PARAMS -+ clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/test/Unit/lit.site.cfg -+ ) - add_subdirectory(test) - add_subdirectory(bindings/python/tests) - --- -2.34.3 - diff --git a/SOURCES/D141581.diff b/SOURCES/D141581.diff deleted file mode 100644 index c227e22..0000000 --- a/SOURCES/D141581.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt ---- a/clang/lib/Basic/CMakeLists.txt -+++ b/clang/lib/Basic/CMakeLists.txt -@@ -110,7 +110,7 @@ - - DEPENDS - omp_gen -- RISCVTargetParserTableGen -+ LLVMTargetParser - ) - - target_link_libraries(clangBasic -diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt ---- a/clang/lib/Driver/CMakeLists.txt -+++ b/clang/lib/Driver/CMakeLists.txt -@@ -93,7 +93,7 @@ - - DEPENDS - ClangDriverOptions -- RISCVTargetParserTableGen -+ LLVMTargetParser - - LINK_LIBS - clangBasic - diff --git a/SOURCES/cfg.patch b/SOURCES/cfg.patch new file mode 100644 index 0000000..779558a --- /dev/null +++ b/SOURCES/cfg.patch @@ -0,0 +1,298 @@ +commit ad4a5130277776d8f15f40ac5a6dede6ad3aabfb +Author: Timm Bäder +Date: Tue Aug 8 14:11:33 2023 +0200 + + [clang][CFG] Cleanup functions + + Add declarations declared with attribute(cleanup(...)) to the CFG, + similar to destructors. + + Differential Revision: https://reviews.llvm.org/D157385 + +diff --git a/clang/include/clang/Analysis/CFG.h b/clang/include/clang/Analysis/CFG.h +index cf4fa2da2a35..67383bb316d3 100644 +--- a/clang/include/clang/Analysis/CFG.h ++++ b/clang/include/clang/Analysis/CFG.h +@@ -14,10 +14,11 @@ + #ifndef LLVM_CLANG_ANALYSIS_CFG_H + #define LLVM_CLANG_ANALYSIS_CFG_H + +-#include "clang/Analysis/Support/BumpVector.h" +-#include "clang/Analysis/ConstructionContext.h" ++#include "clang/AST/Attr.h" + #include "clang/AST/ExprCXX.h" + #include "clang/AST/ExprObjC.h" ++#include "clang/Analysis/ConstructionContext.h" ++#include "clang/Analysis/Support/BumpVector.h" + #include "clang/Basic/LLVM.h" + #include "llvm/ADT/DenseMap.h" + #include "llvm/ADT/GraphTraits.h" +@@ -74,7 +75,8 @@ public: + MemberDtor, + TemporaryDtor, + DTOR_BEGIN = AutomaticObjectDtor, +- DTOR_END = TemporaryDtor ++ DTOR_END = TemporaryDtor, ++ CleanupFunction, + }; + + protected: +@@ -383,6 +385,32 @@ private: + } + }; + ++class CFGCleanupFunction final : public CFGElement { ++public: ++ CFGCleanupFunction() = default; ++ CFGCleanupFunction(const VarDecl *VD) ++ : CFGElement(Kind::CleanupFunction, VD) { ++ assert(VD->hasAttr()); ++ } ++ ++ const VarDecl *getVarDecl() const { ++ return static_cast(Data1.getPointer()); ++ } ++ ++ /// Returns the function to be called when cleaning up the var decl. ++ const FunctionDecl *getFunctionDecl() const { ++ const CleanupAttr *A = getVarDecl()->getAttr(); ++ return A->getFunctionDecl(); ++ } ++ ++private: ++ friend class CFGElement; ++ ++ static bool isKind(const CFGElement E) { ++ return E.getKind() == Kind::CleanupFunction; ++ } ++}; ++ + /// Represents C++ object destructor implicitly generated for automatic object + /// or temporary bound to const reference at the point of leaving its local + /// scope. +@@ -1142,6 +1170,10 @@ public: + Elements.push_back(CFGAutomaticObjDtor(VD, S), C); + } + ++ void appendCleanupFunction(const VarDecl *VD, BumpVectorContext &C) { ++ Elements.push_back(CFGCleanupFunction(VD), C); ++ } ++ + void appendLifetimeEnds(VarDecl *VD, Stmt *S, BumpVectorContext &C) { + Elements.push_back(CFGLifetimeEnds(VD, S), C); + } +diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp +index b82f9010a83f..03ab4c6fdf29 100644 +--- a/clang/lib/Analysis/CFG.cpp ++++ b/clang/lib/Analysis/CFG.cpp +@@ -881,6 +881,10 @@ private: + B->appendAutomaticObjDtor(VD, S, cfg->getBumpVectorContext()); + } + ++ void appendCleanupFunction(CFGBlock *B, VarDecl *VD) { ++ B->appendCleanupFunction(VD, cfg->getBumpVectorContext()); ++ } ++ + void appendLifetimeEnds(CFGBlock *B, VarDecl *VD, Stmt *S) { + B->appendLifetimeEnds(VD, S, cfg->getBumpVectorContext()); + } +@@ -1346,7 +1350,8 @@ private: + return {}; + } + +- bool hasTrivialDestructor(VarDecl *VD); ++ bool hasTrivialDestructor(const VarDecl *VD) const; ++ bool needsAutomaticDestruction(const VarDecl *VD) const; + }; + + } // namespace +@@ -1861,14 +1866,14 @@ void CFGBuilder::addAutomaticObjDestruction(LocalScope::const_iterator B, + if (B == E) + return; + +- SmallVector DeclsNonTrivial; +- DeclsNonTrivial.reserve(B.distance(E)); ++ SmallVector DeclsNeedDestruction; ++ DeclsNeedDestruction.reserve(B.distance(E)); + + for (VarDecl* D : llvm::make_range(B, E)) +- if (!hasTrivialDestructor(D)) +- DeclsNonTrivial.push_back(D); ++ if (needsAutomaticDestruction(D)) ++ DeclsNeedDestruction.push_back(D); + +- for (VarDecl *VD : llvm::reverse(DeclsNonTrivial)) { ++ for (VarDecl *VD : llvm::reverse(DeclsNeedDestruction)) { + if (BuildOpts.AddImplicitDtors) { + // If this destructor is marked as a no-return destructor, we need to + // create a new block for the destructor which does not have as a +@@ -1879,7 +1884,8 @@ void CFGBuilder::addAutomaticObjDestruction(LocalScope::const_iterator B, + Ty = getReferenceInitTemporaryType(VD->getInit()); + Ty = Context->getBaseElementType(Ty); + +- if (Ty->getAsCXXRecordDecl()->isAnyDestructorNoReturn()) ++ const CXXRecordDecl *CRD = Ty->getAsCXXRecordDecl(); ++ if (CRD && CRD->isAnyDestructorNoReturn()) + Block = createNoReturnBlock(); + } + +@@ -1890,8 +1896,10 @@ void CFGBuilder::addAutomaticObjDestruction(LocalScope::const_iterator B, + // objects, we end lifetime with scope end. + if (BuildOpts.AddLifetime) + appendLifetimeEnds(Block, VD, S); +- if (BuildOpts.AddImplicitDtors) ++ if (BuildOpts.AddImplicitDtors && !hasTrivialDestructor(VD)) + appendAutomaticObjDtor(Block, VD, S); ++ if (VD->hasAttr()) ++ appendCleanupFunction(Block, VD); + } + } + +@@ -1922,7 +1930,7 @@ void CFGBuilder::addScopeExitHandling(LocalScope::const_iterator B, + // is destroyed, for automatic variables, this happens when the end of the + // scope is added. + for (VarDecl* D : llvm::make_range(B, E)) +- if (hasTrivialDestructor(D)) ++ if (!needsAutomaticDestruction(D)) + DeclsTrivial.push_back(D); + + if (DeclsTrivial.empty()) +@@ -2095,7 +2103,11 @@ LocalScope* CFGBuilder::addLocalScopeForDeclStmt(DeclStmt *DS, + return Scope; + } + +-bool CFGBuilder::hasTrivialDestructor(VarDecl *VD) { ++bool CFGBuilder::needsAutomaticDestruction(const VarDecl *VD) const { ++ return !hasTrivialDestructor(VD) || VD->hasAttr(); ++} ++ ++bool CFGBuilder::hasTrivialDestructor(const VarDecl *VD) const { + // Check for const references bound to temporary. Set type to pointee. + QualType QT = VD->getType(); + if (QT->isReferenceType()) { +@@ -2149,7 +2161,7 @@ LocalScope* CFGBuilder::addLocalScopeForVarDecl(VarDecl *VD, + return Scope; + + if (!BuildOpts.AddLifetime && !BuildOpts.AddScopes && +- hasTrivialDestructor(VD)) { ++ !needsAutomaticDestruction(VD)) { + assert(BuildOpts.AddImplicitDtors); + return Scope; + } +@@ -5287,6 +5299,7 @@ CFGImplicitDtor::getDestructorDecl(ASTContext &astContext) const { + case CFGElement::CXXRecordTypedCall: + case CFGElement::ScopeBegin: + case CFGElement::ScopeEnd: ++ case CFGElement::CleanupFunction: + llvm_unreachable("getDestructorDecl should only be used with " + "ImplicitDtors"); + case CFGElement::AutomaticObjectDtor: { +@@ -5830,6 +5843,11 @@ static void print_elem(raw_ostream &OS, StmtPrinterHelper &Helper, + break; + } + ++ case CFGElement::Kind::CleanupFunction: ++ OS << "CleanupFunction (" ++ << E.castAs().getFunctionDecl()->getName() << ")\n"; ++ break; ++ + case CFGElement::Kind::LifetimeEnds: + Helper.handleDecl(E.castAs().getVarDecl(), OS); + OS << " (Lifetime ends)\n"; +diff --git a/clang/lib/Analysis/PathDiagnostic.cpp b/clang/lib/Analysis/PathDiagnostic.cpp +index 348afc42319e..0cb03943c547 100644 +--- a/clang/lib/Analysis/PathDiagnostic.cpp ++++ b/clang/lib/Analysis/PathDiagnostic.cpp +@@ -567,6 +567,7 @@ getLocationForCaller(const StackFrameContext *SFC, + } + case CFGElement::ScopeBegin: + case CFGElement::ScopeEnd: ++ case CFGElement::CleanupFunction: + llvm_unreachable("not yet implemented!"); + case CFGElement::LifetimeEnds: + case CFGElement::LoopExit: +diff --git a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp +index 0e2ac78f7089..d7c5bd1d4042 100644 +--- a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp ++++ b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp +@@ -993,6 +993,7 @@ void ExprEngine::processCFGElement(const CFGElement E, ExplodedNode *Pred, + ProcessLoopExit(E.castAs().getLoopStmt(), Pred); + return; + case CFGElement::LifetimeEnds: ++ case CFGElement::CleanupFunction: + case CFGElement::ScopeBegin: + case CFGElement::ScopeEnd: + return; +diff --git a/clang/test/Analysis/scopes-cfg-output.cpp b/clang/test/Analysis/scopes-cfg-output.cpp +index 6877d124e67a..4eb8967e3735 100644 +--- a/clang/test/Analysis/scopes-cfg-output.cpp ++++ b/clang/test/Analysis/scopes-cfg-output.cpp +@@ -1419,3 +1419,68 @@ label: + } + } + } ++ ++// CHECK: [B1] ++// CHECK-NEXT: 1: CFGScopeBegin(i) ++// CHECK-NEXT: 2: int i __attribute__((cleanup(cleanup_int))); ++// CHECK-NEXT: 3: CleanupFunction (cleanup_int) ++// CHECK-NEXT: 4: CFGScopeEnd(i) ++void cleanup_int(int *i); ++void test_cleanup_functions() { ++ int i __attribute__((cleanup(cleanup_int))); ++} ++ ++// CHECK: [B1] ++// CHECK-NEXT: 1: 10 ++// CHECK-NEXT: 2: i ++// CHECK-NEXT: 3: [B1.2] = [B1.1] ++// CHECK-NEXT: 4: return; ++// CHECK-NEXT: 5: CleanupFunction (cleanup_int) ++// CHECK-NEXT: 6: CFGScopeEnd(i) ++// CHECK-NEXT: Preds (1): B3 ++// CHECK-NEXT: Succs (1): B0 ++// CHECK: [B2] ++// CHECK-NEXT: 1: return; ++// CHECK-NEXT: 2: CleanupFunction (cleanup_int) ++// CHECK-NEXT: 3: CFGScopeEnd(i) ++// CHECK-NEXT: Preds (1): B3 ++// CHECK-NEXT: Succs (1): B0 ++// CHECK: [B3] ++// CHECK-NEXT: 1: CFGScopeBegin(i) ++// CHECK-NEXT: 2: int i __attribute__((cleanup(cleanup_int))); ++// CHECK-NEXT: 3: m ++// CHECK-NEXT: 4: [B3.3] (ImplicitCastExpr, LValueToRValue, int) ++// CHECK-NEXT: 5: 1 ++// CHECK-NEXT: 6: [B3.4] == [B3.5] ++// CHECK-NEXT: T: if [B3.6] ++// CHECK-NEXT: Preds (1): B4 ++// CHECK-NEXT: Succs (2): B2 B1 ++void test_cleanup_functions2(int m) { ++ int i __attribute__((cleanup(cleanup_int))); ++ ++ if (m == 1) { ++ return; ++ } ++ ++ i = 10; ++ return; ++} ++ ++// CHECK: [B1] ++// CHECK-NEXT: 1: CFGScopeBegin(f) ++// CHECK-NEXT: 2: (CXXConstructExpr, [B1.3], F) ++// CHECK-NEXT: 3: F f __attribute__((cleanup(cleanup_F))); ++// CHECK-NEXT: 4: CleanupFunction (cleanup_F) ++// CHECK-NEXT: 5: [B1.3].~F() (Implicit destructor) ++// CHECK-NEXT: 6: CFGScopeEnd(f) ++// CHECK-NEXT: Preds (1): B2 ++// CHECK-NEXT: Succs (1): B0 ++class F { ++public: ++ ~F(); ++}; ++void cleanup_F(F *f); ++ ++void test() { ++ F f __attribute((cleanup(cleanup_F))); ++} diff --git a/SOURCES/fix-ieee128-cross.diff b/SOURCES/fix-ieee128-cross.diff deleted file mode 100644 index 218c229..0000000 --- a/SOURCES/fix-ieee128-cross.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/clang/test/Driver/ppc-float-abi-warning.cpp b/clang/test/Driver/ppc-float-abi-warning.cpp -index e3baa9f4c059..87d6d87a3b31 100644 ---- a/clang/test/Driver/ppc-float-abi-warning.cpp -+++ b/clang/test/Driver/ppc-float-abi-warning.cpp -@@ -17,10 +17,12 @@ - // RUN: -mabi=ieeelongdouble -stdlib=libc++ -Wno-unsupported-abi 2>&1 | \ - // RUN: FileCheck %s --check-prefix=NOWARN - // RUN: %clang -### --driver-mode=g++ -target powerpc64le-linux-gnu %s\ -+// RUN: --dyld-prefix=%S/Inputs/powerpc64le-linux-gnu-tree/gcc-12 \ - // RUN: -mabi=%if ppc_linux_default_ieeelongdouble %{ieeelongdouble%} \ - // RUN: %else %{ibmlongdouble%} -stdlib=libc++ 2>&1 | \ - // RUN: FileCheck %s --check-prefix=NOWARN - // RUN: %clang -### --driver-mode=g++ -target powerpc64le-linux-gnu %s\ -+// RUN: --dyld-prefix=%S/Inputs/powerpc64le-linux-gnu-tree/gcc-12 \ - // RUN: -mabi=%if ppc_linux_default_ieeelongdouble %{ibmlongdouble%} \ - // RUN: %else %{ieeelongdouble%} -stdlib=libc++ 2>&1 | FileCheck %s diff --git a/SOURCES/macros.clang b/SOURCES/macros.clang index 6f35452..88f259d 100644 --- a/SOURCES/macros.clang +++ b/SOURCES/macros.clang @@ -8,9 +8,4 @@ # headers and libraries. This path should be used by packages that need to # install files into this directory. This macro's value changes every time # clang's version changes. -%clang_resource_dir %{_libdir}/clang/%{clang_major_version} - -# This is the path to the clang resource directory that should be used -# by packages that need to read files from this directory at runtime. -# This macro only changes when clang's major version changes. -%clang_resource_dir_readonly %{_libdir}/clang/%{clang_major_version} +%clang_resource_dir %{_prefix}/lib/clang/%{clang_major_version} diff --git a/SOURCES/tsa.patch b/SOURCES/tsa.patch new file mode 100644 index 0000000..2cf698e --- /dev/null +++ b/SOURCES/tsa.patch @@ -0,0 +1,124 @@ +commit cf8e189a99f988398a48148b9ea7901948665ab0 +Author: Timm Bäder +Date: Wed Sep 6 12:19:20 2023 +0200 + + [clang][TSA] Thread safety cleanup functions + + Consider cleanup functions in thread safety analysis. + + Differential Revision: https://reviews.llvm.org/D152504 + +diff --git a/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h b/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h +index 9d28325c1ea6..13e37ac2b56b 100644 +--- a/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h ++++ b/clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h +@@ -361,7 +361,7 @@ public: + unsigned NumArgs = 0; + + // Function arguments +- const Expr *const *FunArgs = nullptr; ++ llvm::PointerUnion FunArgs = nullptr; + + // is Self referred to with -> or .? + bool SelfArrow = false; +diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp +index 3107d035254d..3e6ceb7d54c4 100644 +--- a/clang/lib/Analysis/ThreadSafety.cpp ++++ b/clang/lib/Analysis/ThreadSafety.cpp +@@ -1773,7 +1773,8 @@ void BuildLockset::checkPtAccess(const Expr *Exp, AccessKind AK, + /// + /// \param Exp The call expression. + /// \param D The callee declaration. +-/// \param Self If \p Exp = nullptr, the implicit this argument. ++/// \param Self If \p Exp = nullptr, the implicit this argument or the argument ++/// of an implicitly called cleanup function. + /// \param Loc If \p Exp = nullptr, the location. + void BuildLockset::handleCall(const Expr *Exp, const NamedDecl *D, + til::LiteralPtr *Self, SourceLocation Loc) { +@@ -2417,6 +2418,15 @@ void ThreadSafetyAnalyzer::runAnalysis(AnalysisDeclContext &AC) { + AD.getTriggerStmt()->getEndLoc()); + break; + } ++ ++ case CFGElement::CleanupFunction: { ++ const CFGCleanupFunction &CF = BI.castAs(); ++ LocksetBuilder.handleCall(/*Exp=*/nullptr, CF.getFunctionDecl(), ++ SxBuilder.createVariable(CF.getVarDecl()), ++ CF.getVarDecl()->getLocation()); ++ break; ++ } ++ + case CFGElement::TemporaryDtor: { + auto TD = BI.castAs(); + +diff --git a/clang/lib/Analysis/ThreadSafetyCommon.cpp b/clang/lib/Analysis/ThreadSafetyCommon.cpp +index b8286cef396c..63cc66852a9e 100644 +--- a/clang/lib/Analysis/ThreadSafetyCommon.cpp ++++ b/clang/lib/Analysis/ThreadSafetyCommon.cpp +@@ -110,7 +110,8 @@ static StringRef ClassifyDiagnostic(QualType VDT) { + /// \param D The declaration to which the attribute is attached. + /// \param DeclExp An expression involving the Decl to which the attribute + /// is attached. E.g. the call to a function. +-/// \param Self S-expression to substitute for a \ref CXXThisExpr. ++/// \param Self S-expression to substitute for a \ref CXXThisExpr in a call, ++/// or argument to a cleanup function. + CapabilityExpr SExprBuilder::translateAttrExpr(const Expr *AttrExp, + const NamedDecl *D, + const Expr *DeclExp, +@@ -144,7 +145,11 @@ CapabilityExpr SExprBuilder::translateAttrExpr(const Expr *AttrExp, + + if (Self) { + assert(!Ctx.SelfArg && "Ambiguous self argument"); +- Ctx.SelfArg = Self; ++ assert(isa(D) && "Self argument requires function"); ++ if (isa(D)) ++ Ctx.SelfArg = Self; ++ else ++ Ctx.FunArgs = Self; + + // If the attribute has no arguments, then assume the argument is "this". + if (!AttrExp) +@@ -312,8 +317,14 @@ til::SExpr *SExprBuilder::translateDeclRefExpr(const DeclRefExpr *DRE, + ? (cast(D)->getCanonicalDecl() == Canonical) + : (cast(D)->getCanonicalDecl() == Canonical)) { + // Substitute call arguments for references to function parameters +- assert(I < Ctx->NumArgs); +- return translate(Ctx->FunArgs[I], Ctx->Prev); ++ if (const Expr *const *FunArgs = ++ Ctx->FunArgs.dyn_cast()) { ++ assert(I < Ctx->NumArgs); ++ return translate(FunArgs[I], Ctx->Prev); ++ } ++ ++ assert(I == 0); ++ return Ctx->FunArgs.get(); + } + } + // Map the param back to the param of the original function declaration +diff --git a/clang/test/Sema/warn-thread-safety-analysis.c b/clang/test/Sema/warn-thread-safety-analysis.c +index 355616b73d96..642ea88ec3c9 100644 +--- a/clang/test/Sema/warn-thread-safety-analysis.c ++++ b/clang/test/Sema/warn-thread-safety-analysis.c +@@ -72,6 +72,8 @@ int get_value(int *p) SHARED_LOCKS_REQUIRED(foo_.mu_){ + return *p; + } + ++void unlock_scope(struct Mutex *const *mu) __attribute__((release_capability(**mu))); ++ + int main(void) { + + Foo_fun1(1); // expected-warning{{calling function 'Foo_fun1' requires holding mutex 'mu2'}} \ +@@ -127,6 +129,13 @@ int main(void) { + // expected-note@-1{{mutex released here}} + mutex_shared_unlock(&mu1); // expected-warning {{releasing mutex 'mu1' that was not held}} + ++ /// Cleanup functions ++ { ++ struct Mutex* const __attribute__((cleanup(unlock_scope))) scope = &mu1; ++ mutex_exclusive_lock(scope); // Note that we have to lock through scope, because no alias analysis! ++ // Cleanup happens automatically -> no warning. ++ } ++ + return 0; + } + diff --git a/SPECS/clang.spec b/SPECS/clang.spec index 7007f48..ec13f09 100644 --- a/SPECS/clang.spec +++ b/SPECS/clang.spec @@ -1,3 +1,9 @@ +%bcond_with snapshot_build + +%if %{with snapshot_build} +%{llvm_sb} +%endif + # We are building with clang for faster/lower memory LTO builds. # See https://docs.fedoraproject.org/en-US/packaging-guidelines/#_compiler_macros %global toolchain clang @@ -8,9 +14,18 @@ %bcond_with bundle_compat_lib %bcond_without check -%global maj_ver 16 +%global maj_ver 17 %global min_ver 0 %global patch_ver 6 +#global rc_ver 4 + +%if %{with snapshot_build} +%undefine rc_ver +%global maj_ver %{llvm_snapshot_version_major} +%global min_ver %{llvm_snapshot_version_minor} +%global patch_ver %{llvm_snapshot_version_patch} +%endif + %global clang_version %{maj_ver}.%{min_ver}.%{patch_ver} %if %{with compat_build} @@ -21,19 +36,19 @@ %global install_bindir %{install_prefix}/bin %global install_includedir %{install_prefix}/include %global install_libdir %{install_prefix}/lib +%global install_datadir %{install_prefix}/share -%global pkg_bindir %{install_bindir} %global pkg_includedir %{install_includedir} -%global pkg_libdir %{install_libdir} %else %global pkg_name clang %global install_prefix /usr -%global pkg_libdir %{_libdir} +%global install_datadir %{_datadir} +%global install_libdir %{_libdir} %endif %if %{with bundle_compat_lib} -%global compat_maj_ver 15 -%global compat_ver %{compat_maj_ver}.0.7 +%global compat_maj_ver 16 +%global compat_ver %{compat_maj_ver}.0.6 %endif @@ -46,17 +61,23 @@ %global clang_tools_srcdir clang-tools-extra-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src Name: %pkg_name -Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{?dist} +Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} +Release: 5%{?dist} Summary: A C language family front-end for LLVM License: Apache-2.0 WITH LLVM-exception OR NCSA URL: http://llvm.org +%if %{with snapshot_build} +Source0: %{llvm_snapshot_source_prefix}clang-%{llvm_snapshot_yyyymmdd}.src.tar.xz +Source1: %{llvm_snapshot_source_prefix}clang-tools-extra-%{llvm_snapshot_yyyymmdd}.src.tar.xz +%{llvm_snapshot_extra_source_tags} + +%else Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz -Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz.sig +Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz.sig %if %{without compat_build} -Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz -Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz.sig +Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz +Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz.sig %endif Source4: release-keys.asc %if %{with bundle_compat_lib} @@ -67,30 +88,30 @@ Source8: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat Source9: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/cmake-%{compat_ver}.src.tar.xz Source10: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/cmake-%{compat_ver}.src.tar.xz.sig %endif -%if !0%{with compat_build} -Source11: macros.%{name} +%endif +%if %{without compat_build} +Source105: macros.%{name} %endif # Patches for clang +Patch1: 0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch +Patch2: 0003-PATCH-clang-Don-t-install-static-libraries.patch +Patch3: 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch +# Drop the following patch after debugedit adds support to DWARF-5: +# https://sourceware.org/bugzilla/show_bug.cgi?id=28728 +Patch4: 0001-Produce-DWARF4-by-default.patch +# Workaround a bug in ORC on ppc64le. +# More info is available here: https://reviews.llvm.org/D159115#4641826 +Patch5: 0001-Workaround-a-bug-in-ORC-on-ppc64le.patch +# Patches for https://issues.redhat.com/browse/RHEL-1650 +# Remove in clang 18. +Patch6: cfg.patch +Patch7: tsa.patch -Patch1: 0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch -Patch2: 0006-Don-t-install-static-libraries.patch -Patch3: 0002-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch -Patch4: 0010-PATCH-clang-Produce-DWARF4-by-default.patch -# Make clangBasic and clangDriver depend on LLVMTargetParser -# See https://reviews.llvm.org/D141581 -Patch7: D141581.diff -# clang/cmake: Use installed gtest libraries for stand-alone builds -# See https://reviews.llvm.org/D138472 -Patch8: D138472.diff -Patch10: fix-ieee128-cross.diff - -Patch11: 0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch - -# RHEL specific patch -Patch12: 0009-disable-recommonmark.patch -Patch13: 0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch +# RHEL specific patches +Patch101: 0009-disable-recommonmark.patch +Patch102: 0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch %if %{without compat_build} # Patches for clang-tools-extra @@ -105,17 +126,20 @@ BuildRequires: gcc-toolset-%{gts_version}-gdb BuildRequires: clang BuildRequires: cmake BuildRequires: ninja-build + %if %{with compat_build} -BuildRequires: llvm%{maj_ver}-devel = %{version} -BuildRequires: llvm%{maj_ver}-static = %{version} +%global llvm_pkg_name llvm%{maj_ver} %else -BuildRequires: llvm-devel = %{version} -BuildRequires: llvm-test = %{version} +%global llvm_pkg_name llvm +BuildRequires: llvm-test = %{version} +BuildRequires: llvm-googletest = %{version} +%endif + +BuildRequires: %{llvm_pkg_name}-devel = %{version} # llvm-static is required, because clang-tablegen needs libLLVMTableGen, which # is not included in libLLVM.so. -BuildRequires: llvm-static = %{version} -BuildRequires: llvm-googletest = %{version} -%endif +BuildRequires: %{llvm_pkg_name}-static = %{version} +BuildRequires: %{llvm_pkg_name}-cmake-utils = %{version} BuildRequires: libxml2-devel BuildRequires: perl-generators @@ -190,7 +214,7 @@ libomp-devel to enable -fopenmp. %package libs Summary: Runtime library for clang -Requires: %{name}-resource-filesystem%{?_isa} = %{version} +Requires: %{name}-resource-filesystem = %{version} Requires: gcc-toolset-%{gts_version}-gcc-c++ Recommends: compiler-rt%{?_isa} = %{version} # atomic support is not part of compiler-rt @@ -223,9 +247,10 @@ Development header files for clang. %package resource-filesystem Summary: Filesystem package that owns the clang resource directory Provides: %{name}-resource-filesystem(major) = %{maj_ver} +BuildArch: noarch %description resource-filesystem -This package owns the clang resouce directory: $libdir/clang/$version/ +This package owns the clang resouce directory: lib/clang/$version/ %if %{without compat_build} %package analyzer @@ -248,6 +273,15 @@ Requires: emacs-filesystem %description tools-extra A set of extra tools built using Clang's tooling API. +%if 0%{?fedora} +%package tools-extra-devel +Summary: Development header files for clang tools +Requires: %{name}-tools-extra = %{version}-%{release} + +%description tools-extra-devel +Development header files for clang tools. +%endif + # Put git-clang-format in its own package, because it Requires git # and we don't want to force users to install all those dependenices if they # just want clang. @@ -273,7 +307,9 @@ Requires: python3 %prep -%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%if %{without snapshot_build} +%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE0}' +%endif %if %{with bundle_compat_lib} %{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE6}' --data='%{SOURCE5}' @@ -289,10 +325,12 @@ Requires: python3 %autosetup -n %{clang_srcdir} -p2 %else -%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE2}' -%setup -T -q -b 2 -n %{clang_tools_srcdir} -%autopatch -m200 -p2 +%if %{without snapshot_build} +%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE1}' +%endif +%setup -T -q -b 1 -n %{clang_tools_srcdir} +%autopatch -m200 -p2 # failing test case rm test/clang-tidy/checkers/altera/struct-pack-align.cpp @@ -302,7 +340,7 @@ rm test/clang-tidy/checkers/altera/struct-pack-align.cpp clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py %setup -q -n %{clang_srcdir} -%autopatch -M200 -p2 +%autopatch -M%{?!rhel:100}%{?rhel:200} -p2 # failing test case rm test/CodeGen/profile-filter.c @@ -320,6 +358,19 @@ rm test/CodeGen/profile-filter.c %build +# Use ThinLTO to limit build time. +%define _lto_cflags -flto=thin +# And disable LTO on AArch64 entirely. +%ifarch aarch64 +%define _lto_cflags %{nil} +%endif + +# Disable LTO to speed up builds +%if %{with snapshot_build} +%global _lto_cflags %nil +%endif + + %if 0%{?__isa_bits} == 64 sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py %else @@ -362,7 +413,8 @@ mv ../cmake-%{compat_ver}.src ../cmake -DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DCMAKE_C_FLAGS_RELEASE="-fno-lto" \ - -DCMAKE_CXX_FLAGS_RELEASE="-fno-lto" + -DCMAKE_CXX_FLAGS_RELEASE="-fno-lto" \ + -DLLVM_INCLUDE_TESTS:BOOL=OFF %ninja_build -C ../clang-compat-libs libclang.so %ninja_build -C ../clang-compat-libs libclang-cpp.so @@ -370,13 +422,17 @@ mv ../cmake-%{compat_ver}.src ../cmake %endif -# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF to match the default used by Fedora's GCC. +# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF and PPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON to match the +# defaults used by Fedora's GCC. # See https://bugzilla.redhat.com/show_bug.cgi?id=2134146 %cmake -G Ninja \ %ifarch %ix86 -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=OFF \ %endif -DCLANG_DEFAULT_PIE_ON_LINUX=OFF \ +%if 0%{?fedora} || 0%{?rhel} > 9 + -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON \ +%endif -DLLVM_PARALLEL_LINK_JOBS=1 \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -391,6 +447,8 @@ mv ../cmake-%{compat_ver}.src ../cmake -DLLVM_CONFIG:FILEPATH=%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} \ -DCMAKE_INSTALL_PREFIX=%{install_prefix} \ -DCLANG_INCLUDE_TESTS:BOOL=OFF \ + -DLLVM_INCLUDE_TESTS:BOOL=OFF \ + -DLLVM_CMAKE_DIR=%{install_libdir}/cmake/llvm \ %else -DCLANG_INCLUDE_TESTS:BOOL=ON \ -DLLVM_BUILD_UTILS:BOOL=ON \ @@ -403,6 +461,10 @@ mv ../cmake-%{compat_ver}.src ../cmake %else -DLLVM_LIBDIR_SUFFIX= \ %endif +%endif + \ +%if %{with snapshot_build} + -DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \ %endif \ %if %{with compat_build} @@ -410,7 +472,7 @@ mv ../cmake-%{compat_ver}.src ../cmake %else -DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \ %endif - -DLLVM_COMMON_CMAKE_UTILS=%{_libdir}/cmake/llvm \ + -DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \ -DCLANG_ENABLE_ARCMT:BOOL=ON \ -DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \ -DCLANG_INCLUDE_DOCS:BOOL=ON \ @@ -425,7 +487,8 @@ mv ../cmake-%{compat_ver}.src ../cmake \ -DCLANG_BUILD_EXAMPLES:BOOL=OFF \ -DBUILD_SHARED_LIBS=OFF \ - -DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" \ + -DCLANG_REPOSITORY_STRING="%{?dist_vendor} %{version}-%{release}" \ + -DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \ %ifarch %{arm} -DCLANG_DEFAULT_LINKER=lld \ %endif @@ -455,14 +518,14 @@ rm -Rf %{buildroot}%{install_bindir} rm -Rf %{buildroot}%{install_prefix}/share rm -Rf %{buildroot}%{install_prefix}/libexec # Remove scanview-py helper libs -rm -Rf %{buildroot}%{install_prefix}/%{_lib}/{libear,libscanbuild} +rm -Rf %{buildroot}%{install_prefix}/lib/{libear,libscanbuild} %else # File in the macros file for other packages to use. We are not doing this # in the compat package, because the version macros would # conflict with # eachother if both clang and the clang compat package were installed together. -install -p -m0644 -D %{SOURCE11} %{buildroot}%{_rpmmacrodir}/macros.%{name} +install -p -m0644 -D %{SOURCE105} %{buildroot}%{_rpmmacrodir}/macros.%{name} sed -i -e "s|@@CLANG_MAJOR_VERSION@@|%{maj_ver}|" \ -e "s|@@CLANG_MINOR_VERSION@@|%{min_ver}|" \ -e "s|@@CLANG_PATCH_VERSION@@|%{patch_ver}|" \ @@ -517,7 +580,7 @@ chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1* # Create sub-directories in the clang resource directory that will be # populated by other packages -mkdir -p %{buildroot}%{pkg_libdir}/clang/%{maj_ver}/{include,lib,share}/ +mkdir -p %{buildroot}%{install_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/ # Remove clang-tidy headers. We don't ship the libraries for these. @@ -579,13 +642,8 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib" %endif %files libs -%if %{without compat_build} -%{_libdir}/clang/%{maj_ver}/include/* -%{_libdir}/*.so.* -%else -%{pkg_libdir}/*.so.* -%{pkg_libdir}/clang/%{maj_ver}/include/* -%endif +%{install_prefix}/lib/clang/%{maj_ver}/include/* +%{install_libdir}/*.so.* %if %{with bundle_compat_lib} %{_libdir}/libclang.so.%{compat_maj_ver}* %{_libdir}/libclang-cpp.so.%{compat_maj_ver}* @@ -601,20 +659,23 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib" %dir %{_datadir}/clang/ %{_rpmmacrodir}/macros.%{name} %else -%{pkg_libdir}/*.so +%{install_libdir}/*.so %{pkg_includedir}/clang/ %{pkg_includedir}/clang-c/ -%{pkg_libdir}/cmake/ +%{install_libdir}/cmake/ %endif %files resource-filesystem -%dir %{pkg_libdir}/clang/ -%dir %{pkg_libdir}/clang/%{maj_ver}/ -%dir %{pkg_libdir}/clang/%{maj_ver}/include/ -%dir %{pkg_libdir}/clang/%{maj_ver}/lib/ -%dir %{pkg_libdir}/clang/%{maj_ver}/share/ - +%dir %{install_prefix}/lib/clang/ +%dir %{install_prefix}/lib/clang/%{maj_ver}/ +%dir %{install_prefix}/lib/clang/%{maj_ver}/bin/ +%dir %{install_prefix}/lib/clang/%{maj_ver}/include/ +%dir %{install_prefix}/lib/clang/%{maj_ver}/lib/ +%dir %{install_prefix}/lib/clang/%{maj_ver}/share/ %if %{without compat_build} +%{_rpmmacrodir}/macros.%{name} + + %files analyzer %{_bindir}/scan-view %{_bindir}/scan-build @@ -677,6 +738,11 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib" %{_datadir}/clang/run-find-all-symbols.py* %{_datadir}/clang/clang-rename.py* +%if 0%{?fedora} +%files tools-extra-devel +%{_includedir}/clang-tidy/ +%endif + %files -n git-clang-format %{_bindir}/git-clang-format @@ -686,6 +752,24 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib" %endif %changelog +* Tue Jan 09 2024 Timm Bäder - 17.0.6-5 +- Remove compat libs + +* Thu Dec 14 2023 Timm Bäder - 17.0.6-4 +- Add back compat libs until all necessary packages have been rebuilt. + +* Fri Dec 08 2023 Timm Bäder - 17.0.6-3 +- Remove compat libs + +* Wed Dec 06 2023 Timm Bäder - 17.0.6-2 +- Update to 17.0.6 + +* Wed Oct 04 2023 Timm Bäder - 17.0.1-2 +- Pick up macros.clang changes from Fedora + +* Thu Sep 28 2023 Timm Bäder - 17.0.1-1 +- Update to 17.0.1 + * Wed Jul 05 2023 Nikita Popov - 16.0.6-1 - Update to LLVM 16.0.6