Compare commits
No commits in common. "c8-stream-rhel8" and "c9s" have entirely different histories.
c8-stream-
...
c9s
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
0de534cfef38697e115c3ae80634765f05e78e5b SOURCES/cmake-16.0.6.src.tar.xz
|
||||
2db5c88fe9277bb0fa85f49b58e946e49ff235c2 SOURCES/cmake-16.0.6.src.tar.xz.sig
|
||||
2822ff10a016df1fffdeb296f753e9c5fce764ee clang-17.0.6.src.tar.xz
|
||||
1ec17cc98c397d6b4d30f57f14646fa085c9ccce clang-tools-extra-17.0.6.src.tar.xz
|
||||
cba7dea96b093d9989ceb949a21b4180b9d9985e clang-tools-extra-17.0.6.src.tar.xz.sig
|
||||
576ef9aeccf3febe1828c68b3e11ffa921f3fc92 clang-17.0.6.src.tar.xz.sig
|
||||
f005e3b6d41cf92c083d2a16960aaeb1a6e3c76c clang-16.0.6.src.tar.xz
|
||||
bc19124e64c0ffe7ada3d4bad8aec42c0cd05f04 clang-16.0.6.src.tar.xz.sig
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -1,6 +1,5 @@
|
|||
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/cmake-16.0.6.src.tar.xz
|
||||
SOURCES/cmake-16.0.6.src.tar.xz.sig
|
||||
/*.src.rpm
|
||||
/*.src.tar.xz
|
||||
/*.src.tar.xz.sig
|
||||
/cmake/
|
||||
/results_clang/
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
From 73d3b4047d757ef35850e2cef38285b96be82f0f Mon Sep 17 00:00:00 2001
|
||||
From: Nikita Popov <npopov@redhat.com>
|
||||
Date: Tue, 23 May 2023 12:17:29 +0200
|
||||
Subject: [PATCH] [Driver] Give devtoolset path precedence over InstalledDir
|
||||
|
||||
This is a followup to the change from c5fe10f365247c3dd9416b7ec8bad73a60b5946e.
|
||||
While that commit correctly adds the bindir from devtoolset to the
|
||||
path, the driver dir / install dir still comes first. This means
|
||||
we'll still end up picking /usr/bin/ld rather than the one from
|
||||
devtoolset.
|
||||
|
||||
Unfortunately, I don't see any way to test this. In the environment
|
||||
the tests are run, this would only result in a behavior difference
|
||||
if there is an ld binary present in the LLVM build directory, which
|
||||
isn't the case.
|
||||
|
||||
Differential Revision: https://reviews.llvm.org/D151203
|
||||
---
|
||||
clang/lib/Driver/ToolChains/Linux.cpp | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
index 853ff99d9fe5..aecabb46d4b9 100644
|
||||
--- a/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
@@ -244,9 +244,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
|
||||
// With devtoolset on RHEL, we want to add a bin directory that is relative
|
||||
// to the detected gcc install, because if we are using devtoolset gcc then
|
||||
// we want to use other tools from devtoolset (e.g. ld) instead of the
|
||||
- // standard system tools.
|
||||
- PPaths.push_back(Twine(GCCInstallation.getParentLibPath() +
|
||||
- "/../bin").str());
|
||||
+ // standard system tools. This should take precedence over InstalledDir.
|
||||
+ PPaths.insert(PPaths.begin(),
|
||||
+ Twine(GCCInstallation.getParentLibPath() + "/../bin").str());
|
||||
|
||||
if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb)
|
||||
ExtraOpts.push_back("-X");
|
||||
--
|
||||
2.40.1
|
||||
|
|
@ -1,21 +1,20 @@
|
|||
From d95d3fbff661c0390072ed0bb4544d5e2aae5c9a Mon Sep 17 00:00:00 2001
|
||||
From: serge-sans-paille <sguelton@redhat.com>
|
||||
Date: Thu, 25 Feb 2021 14:09:29 +0100
|
||||
From 49f827b09db549de62dcaf8b90b3fcb3e08c0ee5 Mon Sep 17 00:00:00 2001
|
||||
From: Serge Guelton <sguelton@redhat.com>
|
||||
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:
|
|
@ -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 <kkleine@redhat.com>
|
||||
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
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
From a2449cee8c995b56f1892502aab3dfad3d6f3ca1 Mon Sep 17 00:00:00 2001
|
||||
From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
|
||||
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
|
||||
|
|
@ -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 <tstellar@redhat.com>
|
||||
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
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
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
|
||||
-except ImportError:
|
||||
- # 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
|
||||
|
||||
# The encoding of source files.
|
||||
# source_encoding = 'utf-8-sig'
|
|
@ -1,26 +0,0 @@
|
|||
From 701750a896a08d5841a7bc0d187bcddaa6c0f616 Mon Sep 17 00:00:00 2001
|
||||
From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
|
||||
Date: Thu, 16 Mar 2023 17:22:24 -0300
|
||||
Subject: [PATCH] [PowerPC][clang] Fix triple
|
||||
|
||||
Some Linux distributions use ppc64le instead of powerpc.
|
||||
---
|
||||
clang/test/CodeGenCoroutines/pr56329.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/clang/test/CodeGenCoroutines/pr56329.cpp b/clang/test/CodeGenCoroutines/pr56329.cpp
|
||||
index 31d4849af4e7..69e0f1d337cf 100644
|
||||
--- a/clang/test/CodeGenCoroutines/pr56329.cpp
|
||||
+++ b/clang/test/CodeGenCoroutines/pr56329.cpp
|
||||
@@ -2,7 +2,7 @@
|
||||
//
|
||||
// RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++20 %s -O3 -S -emit-llvm -o - | FileCheck %s
|
||||
// This test is expected to fail on PowerPC.
|
||||
-// XFAIL: target=powerpc{{.*}}
|
||||
+// XFAIL: target={{(ppc|powerpc).*}}
|
||||
|
||||
#include "Inputs/coroutine.h"
|
||||
|
||||
--
|
||||
2.39.2
|
||||
-
|
|
@ -1,26 +0,0 @@
|
|||
diff -ruN clang-14.0.0.src.orig/docs/conf.py clang-14.0.0.src/docs/conf.py
|
||||
--- a/clang-14.0.0.src.orig/docs/conf.py 2022-03-14 10:44:55.000000000 +0100
|
||||
+++ b/clang-14.0.0.src/docs/conf.py 2022-04-11 11:13:44.483641113 +0200
|
||||
@@ -37,20 +37,7 @@
|
||||
'.rst': 'restructuredtext',
|
||||
}
|
||||
|
||||
-try:
|
||||
- import recommonmark
|
||||
-except ImportError:
|
||||
- # 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
|
||||
|
||||
# The encoding of source files.
|
||||
#source_encoding = 'utf-8-sig'
|
||||
|
886
SPECS/clang.spec
886
SPECS/clang.spec
|
@ -1,886 +0,0 @@
|
|||
%bcond_with compat_build
|
||||
%bcond_without check
|
||||
|
||||
%global maj_ver 16
|
||||
%global min_ver 0
|
||||
%global patch_ver 6
|
||||
#global rc_ver 4
|
||||
%global clang_version %{maj_ver}.%{min_ver}.%{patch_ver}
|
||||
|
||||
%if %{with compat_build}
|
||||
%global pkg_name clang%{maj_ver}
|
||||
# Install clang to same prefix as llvm, so that apps that use llvm-config
|
||||
# will also be able to find clang libs.
|
||||
%global install_prefix %{_libdir}/llvm%{maj_ver}
|
||||
%global install_bindir %{install_prefix}/bin
|
||||
%global install_includedir %{install_prefix}/include
|
||||
%global install_libdir %{install_prefix}/lib
|
||||
|
||||
%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}
|
||||
%endif
|
||||
|
||||
%global build_install_prefix %{buildroot}%{install_prefix}
|
||||
|
||||
%ifarch ppc64le aarch64
|
||||
# Too many threads on some systems causes OOM errors.
|
||||
%global _smp_mflags -j8
|
||||
%endif
|
||||
|
||||
%global clang_srcdir clang-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
|
||||
%global cmake_srcdir cmake-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
|
||||
%global clang_tools_srcdir clang-tools-extra-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
|
||||
|
||||
%if !%{maj_ver} && 0%{?rc_ver}
|
||||
%global abi_revision 2
|
||||
%endif
|
||||
|
||||
Name: %pkg_name
|
||||
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}
|
||||
Release: 2%{?dist}
|
||||
Summary: A C language family front-end for LLVM
|
||||
|
||||
License: NCSA
|
||||
URL: http://llvm.org
|
||||
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz
|
||||
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}
|
||||
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: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
|
||||
Source5: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
|
||||
Source6: release-keys.asc
|
||||
%if %{without compat_build}
|
||||
Source7: macros.%{name}
|
||||
%endif
|
||||
|
||||
# Patches for clang
|
||||
Patch1: 0003-PATCH-Make-funwind-tables-the-default-on-all-archs.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
|
||||
Patch5: 0010-PATCH-clang-Produce-DWARF4-by-default.patch
|
||||
# Fix a test based on the triple used on RHEL-based systems.
|
||||
Patch6: 0001-PowerPC-clang-Fix-triple.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
|
||||
|
||||
|
||||
|
||||
Patch100: disable-recommonmark.patch
|
||||
|
||||
|
||||
# Patches for clang-tools-extra
|
||||
%if %{without compat_build}
|
||||
Patch201: 0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
|
||||
%endif
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: ninja-build
|
||||
%if %{with compat_build}
|
||||
BuildRequires: llvm%{maj_ver}-devel = %{version}
|
||||
BuildRequires: llvm%{maj_ver}-static = %{version}
|
||||
%else
|
||||
BuildRequires: llvm-devel = %{version}
|
||||
BuildRequires: llvm-test = %{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: libxml2-devel
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: ncurses-devel
|
||||
# According to https://fedoraproject.org/wiki/Packaging:Emacs a package
|
||||
# should BuildRequires: emacs if it packages emacs integration files.
|
||||
BuildRequires: emacs
|
||||
|
||||
# The testsuite uses /usr/bin/lit which is part of the python3-lit package.
|
||||
BuildRequires: python3-lit
|
||||
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: pandoc
|
||||
BuildRequires: libatomic
|
||||
|
||||
# We need python3-devel for %%py3_shebang_fix
|
||||
BuildRequires: python3-devel
|
||||
|
||||
%if ! 0%{?rhel}
|
||||
# For reproducible pyc file generation
|
||||
# See https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility
|
||||
BuildRequires: /usr/bin/marshalparser
|
||||
%global py_reproducible_pyc_path %{buildroot}%{python3_sitelib}
|
||||
%endif
|
||||
|
||||
# Needed for %%multilib_fix_c_header
|
||||
BuildRequires: multilib-rpm-config
|
||||
|
||||
# For origin certification
|
||||
BuildRequires: gnupg2
|
||||
|
||||
# scan-build uses these perl modules so they need to be installed in order
|
||||
# to run the tests.
|
||||
BuildRequires: perl(Digest::MD5)
|
||||
BuildRequires: perl(File::Copy)
|
||||
BuildRequires: perl(File::Find)
|
||||
BuildRequires: perl(File::Path)
|
||||
BuildRequires: perl(File::Temp)
|
||||
BuildRequires: perl(FindBin)
|
||||
BuildRequires: perl(Hash::Util)
|
||||
BuildRequires: perl(lib)
|
||||
BuildRequires: perl(Term::ANSIColor)
|
||||
BuildRequires: perl(Text::ParseWords)
|
||||
BuildRequires: perl(Sys::Hostname)
|
||||
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
# clang requires gcc, clang++ requires libstdc++-devel
|
||||
# - https://bugzilla.redhat.com/show_bug.cgi?id=1021645
|
||||
# - https://bugzilla.redhat.com/show_bug.cgi?id=1158594
|
||||
Requires: libstdc++-devel
|
||||
Requires: gcc-c++
|
||||
|
||||
Provides: clang(major) = %{maj_ver}
|
||||
|
||||
Conflicts: compiler-rt < 11.0.0
|
||||
|
||||
%description
|
||||
clang: noun
|
||||
1. A loud, resonant, metallic sound.
|
||||
2. The strident call of a crane or goose.
|
||||
3. C-language family front-end toolkit.
|
||||
|
||||
The goal of the Clang project is to create a new C, C++, Objective C
|
||||
and Objective C++ front-end for the LLVM compiler. Its tools are built
|
||||
as libraries and designed to be loosely-coupled and extensible.
|
||||
|
||||
Install compiler-rt if you want the Blocks C language extension or to
|
||||
enable sanitization and profiling options when building, and
|
||||
libomp-devel to enable -fopenmp.
|
||||
|
||||
%package libs
|
||||
Summary: Runtime library for clang
|
||||
Requires: %{name}-resource-filesystem%{?_isa} = %{version}
|
||||
# RHEL specific: Use libstdc++ from gcc13 by default. rhbz#2178804
|
||||
Requires: gcc-toolset-13-gcc-c++
|
||||
Recommends: compiler-rt%{?_isa} = %{version}
|
||||
# libomp-devel is required, so clang can find the omp.h header when compiling
|
||||
# with -fopenmp.
|
||||
Recommends: libomp-devel%{_isa} = %{version}
|
||||
Recommends: libomp%{_isa} = %{version}
|
||||
|
||||
# Use lld as the default linker on ARM due to rhbz#1918924
|
||||
%ifarch %{arm}
|
||||
Requires: lld
|
||||
%endif
|
||||
|
||||
%description libs
|
||||
Runtime library for clang.
|
||||
|
||||
%package devel
|
||||
Summary: Development header files for clang
|
||||
%if %{without compat_build}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
# The clang CMake files reference tools from clang-tools-extra.
|
||||
Requires: %{name}-tools-extra%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description devel
|
||||
Development header files for clang.
|
||||
|
||||
%package resource-filesystem
|
||||
Summary: Filesystem package that owns the clang resource directory
|
||||
Provides: %{name}-resource-filesystem(major) = %{maj_ver}
|
||||
|
||||
%description resource-filesystem
|
||||
This package owns the clang resouce directory: $libdir/clang/$version/
|
||||
|
||||
%if %{without compat_build}
|
||||
%package analyzer
|
||||
Summary: A source code analysis framework
|
||||
License: NCSA and MIT
|
||||
BuildArch: noarch
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description analyzer
|
||||
The Clang Static Analyzer consists of both a source code analysis
|
||||
framework and a standalone tool that finds bugs in C and Objective-C
|
||||
programs. The standalone tool is invoked from the command-line, and is
|
||||
intended to run in tandem with a build of a project or code base.
|
||||
|
||||
%package tools-extra
|
||||
Summary: Extra tools for clang
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: emacs-filesystem
|
||||
|
||||
%description tools-extra
|
||||
A set of extra tools built using Clang's tooling API.
|
||||
|
||||
# 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.
|
||||
%package -n git-clang-format
|
||||
Summary: Integration of clang-format for git
|
||||
Requires: %{name}-tools-extra = %{version}-%{release}
|
||||
Requires: git
|
||||
Requires: python3
|
||||
|
||||
%description -n git-clang-format
|
||||
clang-format integration for git.
|
||||
|
||||
|
||||
%package -n python3-clang
|
||||
Summary: Python3 bindings for clang
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: python3
|
||||
%description -n python3-clang
|
||||
%{summary}.
|
||||
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE3}' --data='%{SOURCE0}'
|
||||
%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE5}' --data='%{SOURCE4}'
|
||||
|
||||
%setup -T -q -b 4 -n %{cmake_srcdir}
|
||||
# TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir},
|
||||
# but this is not a CACHED variable, so we can't actually set it externally :(
|
||||
cd ..
|
||||
mv %{cmake_srcdir} cmake
|
||||
|
||||
%if %{with compat_build}
|
||||
%autosetup -n %{clang_srcdir} -p2
|
||||
%else
|
||||
|
||||
%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE2}' --data='%{SOURCE1}'
|
||||
%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
|
||||
|
||||
%py3_shebang_fix \
|
||||
clang-tidy/tool/run-clang-tidy.py \
|
||||
clang-tidy/tool/clang-tidy-diff.py \
|
||||
clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
|
||||
|
||||
|
||||
%setup -q -n %{clang_srcdir}
|
||||
%autopatch -M200 -p2
|
||||
|
||||
# failing test case
|
||||
rm test/CodeGen/profile-filter.c
|
||||
|
||||
%py3_shebang_fix \
|
||||
tools/clang-format/ \
|
||||
tools/clang-format/git-clang-format \
|
||||
utils/hmaptool/hmaptool \
|
||||
tools/scan-view/bin/scan-view \
|
||||
tools/scan-view/share/Reporter.py \
|
||||
tools/scan-view/share/startfile.py \
|
||||
tools/scan-build-py/bin/* \
|
||||
tools/scan-build-py/libexec/*
|
||||
|
||||
# Convert markdown files to rst to cope with the absence of compatible md parser in rhel.
|
||||
# The sed expression takes care of a slight difference between pandoc markdown and sphinx markdown.
|
||||
find -name '*.md' | while read md; do sed -r -e 's/^( )*\* /\n\1\* /' ${md} | pandoc -f markdown -o ${md%.md}.rst ; done
|
||||
|
||||
%endif
|
||||
|
||||
%build
|
||||
# We run the builders out of memory on armv7 and i686 when LTO is enabled
|
||||
%ifarch %{arm} i686
|
||||
%define _lto_cflags %{nil}
|
||||
%else
|
||||
# This package does not ship any object files or static libraries, so we
|
||||
# don't need -ffat-lto-objects.
|
||||
%global _lto_cflags %(echo %{_lto_cflags} | sed 's/-ffat-lto-objects//')
|
||||
%endif
|
||||
|
||||
# lto builds with gcc 11 fail while running the lit tests.
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
%if 0%{?__isa_bits} == 64
|
||||
sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py
|
||||
%else
|
||||
sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
|
||||
%endif
|
||||
|
||||
mkdir -p %{_vpath_builddir}
|
||||
cd %{_vpath_builddir}
|
||||
|
||||
%ifarch s390 s390x %{arm} %ix86 ppc64le aarch64
|
||||
# Decrease debuginfo verbosity to reduce memory consumption during final library linking
|
||||
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
||||
%endif
|
||||
|
||||
|
||||
%set_build_flags
|
||||
CXXFLAGS="$CXXFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
|
||||
CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
|
||||
|
||||
# -DLLVM_ENABLE_NEW_PASS_MANAGER=ON can be removed once this patch is committed:
|
||||
# https://reviews.llvm.org/D107628
|
||||
# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF to match the default used by Fedora's GCC.
|
||||
%cmake .. -G Ninja \
|
||||
-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
|
||||
-DLLVM_PARALLEL_LINK_JOBS=1 \
|
||||
-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DPYTHON_EXECUTABLE=%{__python3} \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=ON \
|
||||
%ifarch s390 s390x %{arm} %ix86 ppc64le aarch64
|
||||
-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
|
||||
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
|
||||
%endif
|
||||
%if %{with compat_build}
|
||||
-DCLANG_BUILD_TOOLS:BOOL=OFF \
|
||||
-DLLVM_CONFIG:FILEPATH=%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} \
|
||||
-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
|
||||
-DCLANG_INCLUDE_TESTS:BOOL=OFF \
|
||||
%else
|
||||
-DCLANG_INCLUDE_TESTS:BOOL=ON \
|
||||
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../../%{clang_tools_srcdir} \
|
||||
-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
|
||||
-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
|
||||
%if 0%{?__isa_bits} == 64
|
||||
-DLLVM_LIBDIR_SUFFIX=64 \
|
||||
%else
|
||||
-DLLVM_LIBDIR_SUFFIX= \
|
||||
%endif
|
||||
%endif
|
||||
\
|
||||
%if %{with compat_build}
|
||||
-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen-%{maj_ver} \
|
||||
%else
|
||||
-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \
|
||||
%endif
|
||||
-DCLANG_ENABLE_ARCMT:BOOL=ON \
|
||||
-DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
|
||||
-DCLANG_INCLUDE_DOCS:BOOL=ON \
|
||||
-DCLANG_PLUGIN_SUPPORT:BOOL=ON \
|
||||
-DENABLE_LINKER_BUILD_ID:BOOL=ON \
|
||||
-DLLVM_ENABLE_EH=ON \
|
||||
-DLLVM_ENABLE_RTTI=ON \
|
||||
-DLLVM_BUILD_DOCS=ON \
|
||||
-DLLVM_ENABLE_NEW_PASS_MANAGER=ON \
|
||||
-DLLVM_ENABLE_SPHINX=ON \
|
||||
-DCLANG_LINK_CLANG_DYLIB=ON \
|
||||
%{?abi_revision:-DLLVM_ABI_REVISION=%{abi_revision}} \
|
||||
-DSPHINX_WARNINGS_AS_ERRORS=OFF \
|
||||
\
|
||||
-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" \
|
||||
%ifarch %{arm}
|
||||
-DCLANG_DEFAULT_LINKER=lld \
|
||||
%endif
|
||||
-DCLANG_DEFAULT_UNWINDLIB=libgcc \
|
||||
-DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-13/root/usr
|
||||
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
|
||||
pushd %{_vpath_builddir}
|
||||
%cmake_install
|
||||
popd
|
||||
|
||||
%if %{with compat_build}
|
||||
|
||||
# Remove binaries/other files
|
||||
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}
|
||||
|
||||
%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 %{SOURCE7} %{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}|" \
|
||||
%{buildroot}%{_rpmmacrodir}/macros.%{name}
|
||||
|
||||
# install clang python bindings
|
||||
mkdir -p %{buildroot}%{python3_sitelib}/clang/
|
||||
install -p -m644 bindings/python/clang/* %{buildroot}%{python3_sitelib}/clang/
|
||||
%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/clang
|
||||
|
||||
# install scanbuild-py to python sitelib.
|
||||
mv %{buildroot}%{_prefix}/%{_lib}/{libear,libscanbuild} %{buildroot}%{python3_sitelib}
|
||||
%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/{libear,libscanbuild}
|
||||
|
||||
# Fix permissions of scan-view scripts
|
||||
chmod a+x %{buildroot}%{_datadir}/scan-view/{Reporter.py,startfile.py}
|
||||
|
||||
# multilib fix
|
||||
%multilib_fix_c_header --file %{_includedir}/clang/Config/config.h
|
||||
|
||||
# Move emacs integration files to the correct directory
|
||||
mkdir -p %{buildroot}%{_emacs_sitestartdir}
|
||||
for f in clang-format.el clang-rename.el clang-include-fixer.el; do
|
||||
mv %{buildroot}{%{_datadir}/clang,%{_emacs_sitestartdir}}/$f
|
||||
done
|
||||
|
||||
# remove editor integrations (bbedit, sublime, emacs, vim)
|
||||
rm -vf %{buildroot}%{_datadir}/clang/clang-format-bbedit.applescript
|
||||
rm -vf %{buildroot}%{_datadir}/clang/clang-format-sublime.py*
|
||||
|
||||
# TODO: Package html docs
|
||||
rm -Rvf %{buildroot}%{_docdir}/Clang/clang/html
|
||||
rm -Rvf %{buildroot}%{_datadir}/clang/clang-doc-default-stylesheet.css
|
||||
rm -Rvf %{buildroot}%{_datadir}/clang/index.js
|
||||
|
||||
# TODO: What are the Fedora guidelines for packaging bash autocomplete files?
|
||||
rm -vf %{buildroot}%{_datadir}/clang/bash-autocomplete.sh
|
||||
|
||||
# Create Manpage symlinks
|
||||
ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++.1.gz
|
||||
ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang-%{maj_ver}.1.gz
|
||||
ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++-%{maj_ver}.1.gz
|
||||
|
||||
# Add clang++-{version} symlink
|
||||
ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}
|
||||
|
||||
|
||||
# Fix permission
|
||||
chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
|
||||
|
||||
%endif
|
||||
|
||||
# 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}/
|
||||
|
||||
|
||||
# Remove clang-tidy headers. We don't ship the libraries for these.
|
||||
rm -Rvf %{buildroot}%{_includedir}/clang-tidy/
|
||||
|
||||
%if %{without compat_build}
|
||||
# Add a symlink in /usr/bin to clang-format-diff
|
||||
ln -s %{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/clang-format-diff
|
||||
%endif
|
||||
|
||||
%check
|
||||
%if %{without compat_build}
|
||||
%if %{with check}
|
||||
# Build test dependencies separately, to prevent invocations of host clang from being affected
|
||||
# by LD_LIBRARY_PATH below.
|
||||
pushd %{_vpath_builddir}
|
||||
%cmake_build --target clang-test-depends \
|
||||
ExtraToolsUnitTests ClangdUnitTests ClangIncludeCleanerUnitTests ClangPseudoUnitTests
|
||||
popd
|
||||
# requires lit.py from LLVM utilities
|
||||
# FIXME: Fix failing ARM tests
|
||||
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir} || \
|
||||
%ifarch %{arm}
|
||||
:
|
||||
%else
|
||||
false
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%if %{without compat_build}
|
||||
%files
|
||||
%license LICENSE.TXT
|
||||
%{_bindir}/clang
|
||||
%{_bindir}/clang++
|
||||
%{_bindir}/clang-%{maj_ver}
|
||||
%{_bindir}/clang++-%{maj_ver}
|
||||
%{_bindir}/clang-cl
|
||||
%{_bindir}/clang-cpp
|
||||
%{_mandir}/man1/clang.1.gz
|
||||
%{_mandir}/man1/clang++.1.gz
|
||||
%{_mandir}/man1/clang-%{maj_ver}.1.gz
|
||||
%{_mandir}/man1/clang++-%{maj_ver}.1.gz
|
||||
%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
|
||||
|
||||
%files devel
|
||||
%if %{without compat_build}
|
||||
%{_libdir}/*.so
|
||||
%{_includedir}/clang/
|
||||
%{_includedir}/clang-c/
|
||||
%{_libdir}/cmake/*
|
||||
%dir %{_datadir}/clang/
|
||||
%{_rpmmacrodir}/macros.%{name}
|
||||
%else
|
||||
%{pkg_libdir}/*.so
|
||||
%{pkg_includedir}/clang/
|
||||
%{pkg_includedir}/clang-c/
|
||||
%{pkg_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/
|
||||
|
||||
%if %{without compat_build}
|
||||
%files analyzer
|
||||
%{_bindir}/scan-view
|
||||
%{_bindir}/scan-build
|
||||
%{_bindir}/analyze-build
|
||||
%{_bindir}/intercept-build
|
||||
%{_bindir}/scan-build-py
|
||||
%{_libexecdir}/ccc-analyzer
|
||||
%{_libexecdir}/c++-analyzer
|
||||
%{_libexecdir}/analyze-c++
|
||||
%{_libexecdir}/analyze-cc
|
||||
%{_libexecdir}/intercept-c++
|
||||
%{_libexecdir}/intercept-cc
|
||||
%{_datadir}/scan-view/
|
||||
%{_datadir}/scan-build/
|
||||
%{_mandir}/man1/scan-build.1.*
|
||||
%{python3_sitelib}/libear
|
||||
%{python3_sitelib}/libscanbuild
|
||||
|
||||
|
||||
%files tools-extra
|
||||
%{_bindir}/amdgpu-arch
|
||||
%{_bindir}/clang-apply-replacements
|
||||
%{_bindir}/clang-change-namespace
|
||||
%{_bindir}/clang-check
|
||||
%{_bindir}/clang-doc
|
||||
%{_bindir}/clang-extdef-mapping
|
||||
%{_bindir}/clang-format
|
||||
%{_bindir}/clang-include-cleaner
|
||||
%{_bindir}/clang-include-fixer
|
||||
%{_bindir}/clang-move
|
||||
%{_bindir}/clang-offload-bundler
|
||||
%{_bindir}/clang-offload-packager
|
||||
%{_bindir}/clang-linker-wrapper
|
||||
%{_bindir}/clang-pseudo
|
||||
%{_bindir}/clang-query
|
||||
%{_bindir}/clang-refactor
|
||||
%{_bindir}/clang-rename
|
||||
%{_bindir}/clang-reorder-fields
|
||||
%{_bindir}/clang-repl
|
||||
%{_bindir}/clang-scan-deps
|
||||
%{_bindir}/clang-tidy
|
||||
%{_bindir}/clangd
|
||||
%{_bindir}/diagtool
|
||||
%{_bindir}/hmaptool
|
||||
%{_bindir}/nvptx-arch
|
||||
%{_bindir}/pp-trace
|
||||
%{_bindir}/c-index-test
|
||||
%{_bindir}/find-all-symbols
|
||||
%{_bindir}/modularize
|
||||
%{_bindir}/clang-format-diff
|
||||
%{_mandir}/man1/diagtool.1.gz
|
||||
%{_emacs_sitestartdir}/clang-format.el
|
||||
%{_emacs_sitestartdir}/clang-rename.el
|
||||
%{_emacs_sitestartdir}/clang-include-fixer.el
|
||||
%{_datadir}/clang/clang-format.py*
|
||||
%{_datadir}/clang/clang-format-diff.py*
|
||||
%{_datadir}/clang/clang-include-fixer.py*
|
||||
%{_datadir}/clang/clang-tidy-diff.py*
|
||||
%{_bindir}/run-clang-tidy
|
||||
%{_datadir}/clang/run-find-all-symbols.py*
|
||||
%{_datadir}/clang/clang-rename.py*
|
||||
|
||||
%files -n git-clang-format
|
||||
%{_bindir}/git-clang-format
|
||||
|
||||
%files -n python3-clang
|
||||
%{python3_sitelib}/clang/
|
||||
|
||||
|
||||
%endif
|
||||
%changelog
|
||||
* Thu Jun 29 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-2
|
||||
- Use gcc-toolset-13 by default
|
||||
|
||||
* Sat Jun 17 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-1
|
||||
- 16.0.6 Release
|
||||
|
||||
* Fri May 12 2023 Tom Stellard <tstellar@redhat.com> - 16.0.0-2
|
||||
- Fix clang_resource_dir macro
|
||||
|
||||
* Fri Apr 28 2023 Tom Stellard <tstelar@redhat.com> - 16.0.0-1
|
||||
- 16.0.0 Release
|
||||
|
||||
* Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1
|
||||
- Update to LLVM 15.0.7
|
||||
|
||||
* Tue Sep 06 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-1
|
||||
- Update to LLVM 15.0.0
|
||||
|
||||
* Tue Jun 28 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-1
|
||||
- 14.0.6 Release
|
||||
|
||||
* Wed Jun 01 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-2
|
||||
- Increate gcc-toolset dependency to 12
|
||||
- Set GCC_INSTALL_PREFIX variable
|
||||
|
||||
* Thu Apr 07 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
|
||||
- Update to 14.0.0
|
||||
|
||||
* Thu Feb 03 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-1
|
||||
- 13.0.1 Release
|
||||
|
||||
* Fri Jan 21 2022 Serge Guelton - 13.0.0-3
|
||||
- Backport bidi patches
|
||||
|
||||
* Fri Oct 22 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-2
|
||||
- Don't emit unwind tables for bpf
|
||||
|
||||
* Fri Oct 15 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-1
|
||||
- 13.0.0 Release
|
||||
|
||||
* Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1
|
||||
- 12.0.1 release
|
||||
|
||||
* Thu May 6 2021 sguelton@redhat.com - 12.0.0-1
|
||||
- 12.0.0 release
|
||||
|
||||
* Thu Oct 29 2020 sguelton@redhat.com - 11.0.0-1
|
||||
- 11.0.0 final release
|
||||
|
||||
* Thu Sep 17 2020 sguelton@redhat.com - 11.0.0-0.1.rc2
|
||||
- 11.0.0-rc2 Release
|
||||
|
||||
* Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1
|
||||
- 10.0.1 release
|
||||
|
||||
* Thu Apr 9 2020 sguelton@redhat.com - 10.0.0-1
|
||||
- 10.0.0 final
|
||||
|
||||
* Fri Jan 10 2020 Tom Stellard <tstellar@redhat.com> - 9.0.1-2
|
||||
- Fix crash with kernel bpf self-tests
|
||||
|
||||
* Thu Dec 19 2019 Tom Stellard <tstellar@redhat.com> - 9.0.1-1
|
||||
- 9.0.1 Release
|
||||
|
||||
* Fri Nov 15 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-5
|
||||
- Fix typo from previous patch: move clang-libs dep to correct sub-package
|
||||
|
||||
* Thu Nov 14 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-4
|
||||
- Add explicit requires for clang-libs to fix rpmdiff errors
|
||||
|
||||
* Wed Oct 02 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-3
|
||||
- Limit build to 8 threads to avoid OOM on x86_64
|
||||
|
||||
* Wed Oct 02 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-2
|
||||
- Disable CLANG_LINK_CLANG_DYLIB
|
||||
|
||||
* Fri Sep 27 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-1
|
||||
- 9.0.0 Release
|
||||
|
||||
* Thu Aug 1 2019 sguelton@redhat.com - 8.0.1-1
|
||||
- 8.0.1 Release
|
||||
|
||||
* Thu Jun 13 2019 sguelton@redhat.com - 8.0.1-0.1.rc2
|
||||
- 8.0.1rc2 Release
|
||||
|
||||
* Thu Apr 11 2019 sguelton@redhat.com - 8.0.0-1
|
||||
- 8.0.0 Release
|
||||
|
||||
* Fri Dec 14 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-1
|
||||
- 7.0.1-1 Release
|
||||
|
||||
* Mon Dec 10 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-0.1.rc3
|
||||
- 7.0.1-rc3 Release
|
||||
|
||||
* Mon Nov 05 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-12
|
||||
- User helper macro to fixup config.h for multilib
|
||||
|
||||
* Sat Oct 27 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-11
|
||||
- Enable make check
|
||||
|
||||
* Mon Oct 15 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-10
|
||||
- Remove Provides: llvm-toolset-6.0-clang-libs
|
||||
|
||||
* Fri Oct 12 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-9
|
||||
- Add Provides: llvm-toolset-6.0-clang-libs
|
||||
|
||||
* Tue Oct 02 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-8
|
||||
- Don't use python2 for the build
|
||||
|
||||
* Mon Oct 01 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-7
|
||||
- Drop scl macros
|
||||
|
||||
* Tue Sep 25 2018 Tomas Orsava <torsava@redhat.com> - 6.0.1-6
|
||||
- Change Requires from python3 to platform-python
|
||||
- The python3 package was renamed to platform-python
|
||||
- Related: rhbz#1619153
|
||||
|
||||
* Fri Sep 14 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-5
|
||||
- Use python3 for git-clang-format
|
||||
|
||||
* Thu Sep 13 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-4
|
||||
- Fix python dependencies
|
||||
|
||||
* Tue Aug 07 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-3
|
||||
- Install ld.so.conf file in the root filesystem
|
||||
|
||||
* Thu Aug 02 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-2
|
||||
- Remove annobin work-around
|
||||
|
||||
* Wed Jul 11 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-1
|
||||
- 6.0.1 Release
|
||||
|
||||
* Wed Apr 11 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-7
|
||||
- Add conditionals to enable building only the clang-libs package
|
||||
|
||||
* Fri Apr 06 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-6
|
||||
- Use cmake from base RHEL
|
||||
|
||||
* Mon Mar 19 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-5
|
||||
- Backport r310435 from clang trunk. rhbz#1558223
|
||||
|
||||
* Mon Mar 19 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-4
|
||||
- Use system gcc instead of dts.
|
||||
|
||||
* Tue Feb 06 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-3
|
||||
- Backport retpoline support
|
||||
|
||||
* Sat Jan 20 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-2
|
||||
- Limit number of build threads on ppc64le to avoid OOM errors
|
||||
|
||||
* Tue Jan 09 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-1
|
||||
- 5.0.1 Release
|
||||
|
||||
* Wed Jun 21 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-1
|
||||
- 4.0.1 Release.
|
||||
|
||||
* Wed Jun 21 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-15
|
||||
- Fix Requires for clang-tools-extra
|
||||
|
||||
* Wed Jun 21 2017 Tom Stellard <tstellar@redhat.com - 4.0.0-14
|
||||
- Fix Requires for clang-tools-extra
|
||||
|
||||
* Tue Jun 20 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-13
|
||||
- Drop libomp dependency on s390x
|
||||
|
||||
* Thu Jun 15 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-12
|
||||
- Use libstdc++ from devtoolset-7
|
||||
|
||||
* Wed Jun 07 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-11
|
||||
- Fix libomp requires
|
||||
|
||||
* Wed Jun 07 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-10
|
||||
- Build for llvm-toolset-7 rename
|
||||
|
||||
* Tue May 30 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-9
|
||||
- Use ld from devtoolset in clang toolchain
|
||||
|
||||
* Mon May 29 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-8
|
||||
- Add dependency on libopenmp
|
||||
|
||||
* Thu May 25 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-7
|
||||
- Fix check for gcc install
|
||||
|
||||
* Wed May 24 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-6
|
||||
- Add devtoolset-6 dependency for newer libstdc++
|
||||
|
||||
* Fri May 12 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-5
|
||||
- Add dependency on compiler-rt
|
||||
|
||||
* Tue May 02 2017 Tom Stellard <tstellar@redhat.com>
|
||||
- Fix dependencies with scl
|
||||
|
||||
* Mon May 01 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-4
|
||||
- Build with llvm-toolset-4
|
||||
|
||||
* Mon Mar 27 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-3
|
||||
- Enable eh/rtti, which are required by lldb.
|
||||
|
||||
* Fri Mar 24 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-2
|
||||
- Fix clang-tools-extra build
|
||||
- Fix install
|
||||
|
||||
* Thu Mar 23 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-1
|
||||
- clang 4.0.0 final release
|
||||
|
||||
* Mon Mar 20 2017 David Goerger <david.goerger@yale.edu> - 3.9.1-3
|
||||
- add clang-tools-extra rhbz#1328091
|
||||
|
||||
* Thu Mar 16 2017 Tom Stellard <tstellar@redhat.com> - 3.9.1-2
|
||||
- Enable build-id by default rhbz#1432403
|
||||
|
||||
* Thu Mar 02 2017 Dave Airlie <airlied@redhat.com> - 3.9.1-1
|
||||
- clang 3.9.1 final release
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Nov 14 2016 Nathaniel McCallum <npmccallum@redhat.com> - 3.9.0-3
|
||||
- Add Requires: compiler-rt to clang-libs.
|
||||
- Without this, compiling with certain CFLAGS breaks.
|
||||
|
||||
* Tue Nov 1 2016 Peter Robinson <pbrobinson@fedoraproject.org> 3.9.0-2
|
||||
- Rebuild for new arches
|
||||
|
||||
* Fri Oct 14 2016 Dave Airlie <airlied@redhat.com> - 3.9.0-1
|
||||
- clang 3.9.0 final release
|
||||
|
||||
* Fri Jul 01 2016 Stephan Bergmann <sbergman@redhat.com> - 3.8.0-2
|
||||
- Resolves: rhbz#1282645 add GCC abi_tag support
|
||||
|
||||
* Thu Mar 10 2016 Dave Airlie <airlied@redhat.com> 3.8.0-1
|
||||
- clang 3.8.0 final release
|
||||
|
||||
* Thu Mar 03 2016 Dave Airlie <airlied@redhat.com> 3.8.0-0.4
|
||||
- clang 3.8.0rc3
|
||||
|
||||
* Wed Feb 24 2016 Dave Airlie <airlied@redhat.com> - 3.8.0-0.3
|
||||
- package all libs into clang-libs.
|
||||
|
||||
* Wed Feb 24 2016 Dave Airlie <airlied@redhat.com> 3.8.0-0.2
|
||||
- enable dynamic linking of clang against llvm
|
||||
|
||||
* Thu Feb 18 2016 Dave Airlie <airlied@redhat.com> - 3.8.0-0.1
|
||||
- clang 3.8.0rc2
|
||||
|
||||
* Fri Feb 12 2016 Dave Airlie <airlied@redhat.com> 3.7.1-4
|
||||
- rebuild against latest llvm packages
|
||||
- add BuildRequires llvm-static
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Jan 28 2016 Dave Airlie <airlied@redhat.com> 3.7.1-2
|
||||
- just accept clang includes moving to /usr/lib64, upstream don't let much else happen
|
||||
|
||||
* Thu Jan 28 2016 Dave Airlie <airlied@redhat.com> 3.7.1-1
|
||||
- initial build in Fedora.
|
||||
|
||||
* Tue Oct 06 2015 Jan Vcelak <jvcelak@fedoraproject.org> 3.7.0-100
|
||||
- initial version using cmake build system
|
|
@ -0,0 +1,298 @@
|
|||
commit ad4a5130277776d8f15f40ac5a6dede6ad3aabfb
|
||||
Author: Timm Bäder <tbaeder@redhat.com>
|
||||
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<CleanupAttr>());
|
||||
+ }
|
||||
+
|
||||
+ const VarDecl *getVarDecl() const {
|
||||
+ return static_cast<VarDecl *>(Data1.getPointer());
|
||||
+ }
|
||||
+
|
||||
+ /// Returns the function to be called when cleaning up the var decl.
|
||||
+ const FunctionDecl *getFunctionDecl() const {
|
||||
+ const CleanupAttr *A = getVarDecl()->getAttr<CleanupAttr>();
|
||||
+ 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<VarDecl *, 10> DeclsNonTrivial;
|
||||
- DeclsNonTrivial.reserve(B.distance(E));
|
||||
+ SmallVector<VarDecl *, 10> 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<CleanupAttr>())
|
||||
+ 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<CleanupAttr>();
|
||||
+}
|
||||
+
|
||||
+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<CFGCleanupFunction>().getFunctionDecl()->getName() << ")\n";
|
||||
+ break;
|
||||
+
|
||||
case CFGElement::Kind::LifetimeEnds:
|
||||
Helper.handleDecl(E.castAs<CFGLifetimeEnds>().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<CFGLoopExit>().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)));
|
||||
+}
|
|
@ -0,0 +1,4 @@
|
|||
# clang needs libstdc++-devel installed in order to compile c++ programs.
|
||||
addFilter("E: devel-dependency libstdc\+\+-devel")
|
||||
addFilter("E: explicit-lib-dependency libstdc\+\+-devel")
|
||||
addFilter("E: hardcoded-library-path in %{_prefix}/lib/{libear")
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,19 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_testing
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_stable
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.rebuild.validation}
|
|
@ -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}
|
|
@ -0,0 +1,8 @@
|
|||
---
|
||||
annocheck:
|
||||
# Currently lto is disabled globally for clang.
|
||||
# Note that all (default hardened) flags need to be repeated here, if
|
||||
# you override some config flags it will completely overwrite the
|
||||
# defaults (--ignore-unknown --verbose).
|
||||
- hardened: --ignore-unknown --verbose --skip-lto
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
SHA512 (clang-17.0.6.src.tar.xz) = da6f670a52d60c46bbe6bfa2870106f6a6714c9566fab293b8c624a555308104a1a05cd065643091d7006ef4533a9a722dff1fccaf26f348a0c0a5c7b9331439
|
||||
SHA512 (clang-tools-extra-17.0.6.src.tar.xz) = 5110dd36ee1c966d22760000f0c28cf070fd00b05445d418d264dbd3b48426a203f934e402d408fab2602dbf39a29d66898cc7c69c1a52b5e0e6e7097f9db877
|
||||
SHA512 (clang-tools-extra-17.0.6.src.tar.xz.sig) = 17ed3072a402ffa9f723e5ae5257a68ea6f9c874bec50d91c88159d38d8c121d23974ff3983f6f0d3308b5ec07086ba5c2d4cabfe6cbefeb6613fc30b577f966
|
||||
SHA512 (clang-17.0.6.src.tar.xz.sig) = 091dca426d275f5a71836f2230e0f12f212527259cc4a941638104b8fcf42b4a122f9c140d07f8c663d38242d10ca5390de1f89d9d7bc0171b66c77a9aebbb3f
|
||||
SHA512 (clang-16.0.6.src.tar.xz) = 92c65b882e1504f4a9b8a3f6b8a24061505987aaacc8bb835115b4e4d74ac3a8c98343a308567b07c6b42bb99877c300bce3c4a5a25ada77abe65606aa25188d
|
||||
SHA512 (clang-16.0.6.src.tar.xz.sig) = a3e68c07d61ce62dfe406464f1afce352f36480966ceaa3171889ac1f02441d9df48e938b3e81d6b73b5957dd6623171323a9915281dc052be0c5c7014e75f24
|
||||
SHA512 (llvm-16.0.6.src.tar.xz.sig) = 9adda28085f4a2e2a64dab1d8e4ff23c5629bbb0bb6b34afc081e44f6f85ac4f3c6cd0c3488af98c0fad939c33f9d2a8a0cbef67a577cd7fe3013bc2200452b1
|
||||
SHA512 (cmake-16.0.6.src.tar.xz) = 52ecd941d2d85a5b668caa5d0d40480cb6a97b3bf1174e634c2a93e9ef6d03670ca7e96abb0a60cb33ba537b93d5788754dab1f2f45c1f623f788162717d088b
|
||||
SHA512 (cmake-16.0.6.src.tar.xz.sig) = d20c5e51315aa476775e6ce886684b9f882ce283fc40aa6c1b8f03964c77a1e745e2e1fb00b3488dddfe1a04378e2bfd090350de28e58088525a5305ecb1bea6
|
||||
SHA512 (llvm-16.0.6.src.tar.xz) = 8d4cdadc9a1ad249fbf9248c8e56f3bcafab73a473a0b0ca73499ed8825c62e27668aac4f1d03341631e5ad93701621e834e9e196ca32eac3ef805cf1c860083
|
|
@ -0,0 +1,55 @@
|
|||
#
|
||||
# Build/PR gating tests for *LLVM 13*
|
||||
#
|
||||
# Imports and runs tests provided by Fedora LLVM git for the matching LLVM version.
|
||||
#
|
||||
# NOTE: *always* keep this file in sync with upstream, i.e. Fedora. Since we cannot "discover" a plan,
|
||||
# we must duplicate at least some part of upstream plan setup, like `adjust` or `provision`. Not necessarily
|
||||
# all steps, btu if we do need some of them here, let's focus on making changes in upstream first, to preserve
|
||||
# one source of truth. Once TMT learns to include whole plans, we could drop the copied content from here.
|
||||
#
|
||||
|
||||
summary: Clang tests for build/PR gating
|
||||
adjust:
|
||||
- because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR."
|
||||
when: >-
|
||||
trigger is defined
|
||||
and trigger != commit
|
||||
and trigger != build
|
||||
enabled: false
|
||||
|
||||
# Unfortunately, TMT does not support more declarative approach, we need to run commands on our own.
|
||||
- because: "On RHEL, CRB must be enabled to provide rarer packages"
|
||||
prepare+:
|
||||
- name: Enable CRB
|
||||
how: shell
|
||||
script: dnf config-manager --set-enabled rhel-CRB
|
||||
when: >-
|
||||
distro == rhel-9
|
||||
or distro == rhel-8
|
||||
|
||||
# Unfortunately, TMT does not support more declarative approach, we need to run commands on our own.
|
||||
- because: "On CentOS, CRB must be enabled to provide rarer packages"
|
||||
prepare+:
|
||||
- name: Enable CRB
|
||||
how: shell
|
||||
script: dnf install -y 'dnf-command(config-manager)' && dnf config-manager --set-enabled crb
|
||||
when: >-
|
||||
distro == centos
|
||||
|
||||
discover:
|
||||
- name: clang-tests
|
||||
how: fmf
|
||||
url: https://src.fedoraproject.org/tests/clang.git
|
||||
ref: main
|
||||
filter: "tag:-not-in-default"
|
||||
- name: upstream-llvm-integration-testsuite
|
||||
how: fmf
|
||||
url: https://src.fedoraproject.org/tests/llvm.git
|
||||
ref: main
|
||||
test: integration-test-suite
|
||||
execute:
|
||||
how: tmt
|
||||
provision:
|
||||
hardware:
|
||||
memory: ">= 4 GiB"
|
|
@ -0,0 +1,124 @@
|
|||
commit cf8e189a99f988398a48148b9ea7901948665ab0
|
||||
Author: Timm Bäder <tbaeder@redhat.com>
|
||||
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<const Expr *const *, til::SExpr *> 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<CFGCleanupFunction>();
|
||||
+ LocksetBuilder.handleCall(/*Exp=*/nullptr, CF.getFunctionDecl(),
|
||||
+ SxBuilder.createVariable(CF.getVarDecl()),
|
||||
+ CF.getVarDecl()->getLocation());
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
case CFGElement::TemporaryDtor: {
|
||||
auto TD = BI.castAs<CFGTemporaryDtor>();
|
||||
|
||||
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<FunctionDecl>(D) && "Self argument requires function");
|
||||
+ if (isa<CXXMethodDecl>(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<FunctionDecl>(D)->getCanonicalDecl() == Canonical)
|
||||
: (cast<ObjCMethodDecl>(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<const Expr *const *>()) {
|
||||
+ assert(I < Ctx->NumArgs);
|
||||
+ return translate(FunArgs[I], Ctx->Prev);
|
||||
+ }
|
||||
+
|
||||
+ assert(I == 0);
|
||||
+ return Ctx->FunArgs.get<til::SExpr *>();
|
||||
}
|
||||
}
|
||||
// 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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue