25 changed files with 1999 additions and 903 deletions
--- a/.clang.metadata
+++ b/.clang.metadata
@ -1,4 +1,6 @@
-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
+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
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,5 @@
-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
+/*.src.rpm
+/*.src.tar.xz
+/*.src.tar.xz.sig
+/cmake/
+/results_clang/
--- a/SOURCES/0001-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
--- a/0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch
+++ b/0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch
@ -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
+
--- a/SOURCES/0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
+++ b/SOURCES/0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
--- a/SOURCES/0001-Produce-DWARF4-by-default.patch
+++ b/SOURCES/0001-Produce-DWARF4-by-default.patch
--- a/SOURCES/0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
+++ b/SOURCES/0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
--- a/SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
+++ b/SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
--- a/SOURCES/0003-PATCH-clang-Don-t-install-static-libraries.patch
+++ b/SOURCES/0003-PATCH-clang-Don-t-install-static-libraries.patch
--- a/SOURCES/0009-disable-recommonmark.patch
+++ b/SOURCES/0009-disable-recommonmark.patch
--- a/D138472.diff
+++ b/D138472.diff
@ -0,0 +1,53 @@
+From 04b642c646048dd9df652eba05d45beaa13bc895 Mon Sep 17 00:00:00 2001
+From: Konrad Kleine <kkleine@redhat.com>
+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
+
--- a/D141581.diff
+++ b/D141581.diff
@ -0,0 +1,25 @@
+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
+
--- a/SPECS/clang.spec
+++ b/SPECS/clang.spec
@ -1,895 +0,0 @@
-%bcond_with snapshot_build
-
-%if %{with snapshot_build}
-%{llvm_sb}
-%endif
-
-# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
-# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
-%undefine _include_frame_pointers
-
-%bcond_with compat_build
-%bcond_without check
-
-%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}
-%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 install_datadir %{install_prefix}/share
-
-%global pkg_includedir %{install_includedir}
-%else
-%global pkg_name clang
-%global install_prefix /usr
-%global install_datadir %{_datadir}
-%global install_libdir %{_libdir}
-%endif
-
-%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 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}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	1%{?dist}
-Summary:	A C language family front-end for LLVM
-
-License:	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
-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:	release-keys.asc
-%endif
-%if %{without compat_build}
-Source5:	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
-
-# RHEL specific patches
-# Avoid unwanted dependency on python-recommonmark
-Patch101:  0009-disable-recommonmark.patch
-
-%if %{without compat_build}
-# Patches for clang-tools-extra
-# See https://reviews.llvm.org/D120301
-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}
-%global llvm_pkg_name llvm%{maj_ver}
-%else
-%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_pkg_name}-static = %{version}
-BuildRequires:	%{llvm_pkg_name}-cmake-utils = %{version}
-
-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 = %{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}
-
-%description libs
-Runtime library for clang.
-
-%package devel
-Summary: Development header files for clang
-Requires: %{name}-libs = %{version}-%{release}
-%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}
-%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}
-BuildArch: noarch
-
-%description resource-filesystem
-This package owns the clang resouce directory: lib/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.
-
-%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.
-
-# 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}-devel%{?_isa} = %{version}-%{release}
-Requires:      python3
-%description -n python3-clang
-%{summary}.
-
-
-%endif
-
-
-%prep
-%if %{without snapshot_build}
-%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE0}'
-%endif
-
-%if %{with compat_build}
-%autosetup -n %{clang_srcdir} -p2
-%else
-
-%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
-
-%py3_shebang_fix \
-	clang-tidy/tool/ \
-	clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-
-
-%setup -q -n %{clang_srcdir}
-%autopatch -M%{?!rhel:100}%{?rhel:200} -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
-
-%undefine __cmake_in_source_build
-
-# 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
-
-%ifarch s390 s390x aarch64 %ix86 ppc64le
-# Decrease debuginfo verbosity to reduce memory consumption during final library linking
-%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
-%endif
-
-# Disable dwz on aarch64, because it takes a huge amount of time to decide not to optimize things.
-%ifarch aarch64
-%define _find_debuginfo_dwz_opts %{nil}
-%endif
-
-
-%set_build_flags
-CXXFLAGS="$CXXFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
-CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
-
-# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF and PPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON to match the
-# defaults used by Fedora's GCC.
-%cmake -G Ninja \
-	-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 \
-	-DPYTHON_EXECUTABLE=%{__python3} \
-	-DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch s390 s390x %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 \
-	-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 \
-	-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../%{clang_tools_srcdir} \
-	-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
-	-DLLVM_LIT_ARGS="-vv" \
-	-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
-%if 0%{?__isa_bits} == 64
-	-DLLVM_LIBDIR_SUFFIX=64 \
-%else
-	-DLLVM_LIBDIR_SUFFIX= \
-%endif
-%endif
-	\
-%if %{with snapshot_build}
-	-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
-%endif
-	\
-%if %{with compat_build}
-	-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen-%{maj_ver} \
-%else
-	-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \
-%endif
-	-DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \
-	-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_SPHINX=ON \
-	-DCLANG_LINK_CLANG_DYLIB=ON \
-	-DSPHINX_WARNINGS_AS_ERRORS=OFF \
-	\
-	-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
-	-DBUILD_SHARED_LIBS=OFF \
-	-DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" \
-	-DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-13/root/usr \
-	-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
-	-DCLANG_DEFAULT_UNWINDLIB=libgcc
-
-%cmake_build
-
-%install
-
-%cmake_install
-
-%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 %{SOURCE5} %{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}%{install_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/
-
-
-%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.
-%cmake_build --target clang-test-depends \
-    ExtraToolsUnitTests ClangdUnitTests ClangIncludeCleanerUnitTests ClangPseudoUnitTests
-# requires lit.py from LLVM utilities
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir}
-%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
-%{install_prefix}/lib/clang/%{maj_ver}/include/*
-%{install_libdir}/*.so.*
-
-%files devel
-%if %{without compat_build}
-%{_libdir}/*.so
-%{_includedir}/clang/
-%{_includedir}/clang-c/
-%{_libdir}/cmake/*
-%{_bindir}/clang-tblgen
-%dir %{_datadir}/clang/
-%else
-%{install_libdir}/*.so
-%{pkg_includedir}/clang/
-%{pkg_includedir}/clang-c/
-%{install_libdir}/cmake/
-%endif
-
-%files resource-filesystem
-%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
-%{_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 tools-extra-devel
-%{_includedir}/clang-tidy/
-
-%files -n git-clang-format
-%{_bindir}/git-clang-format
-
-%files -n python3-clang
-%{python3_sitelib}/clang/
-
-
-%endif
-%changelog
-* Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
- Update to LLVM 17.0.6
-
-* Wed Oct 04 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-1
- Update to LLVM 17.0.2
-
-* 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
--- a/cfg.patch
+++ b/cfg.patch
@ -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)));
+}
--- a/clang.rpmlintrc
+++ b/clang.rpmlintrc
@ -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")
--- a/clang.spec
+++ b/clang.spec
--- a/fix-ieee128-cross.diff
+++ b/fix-ieee128-cross.diff
@ -0,0 +1,16 @@
+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
--- a/gating.yaml
+++ b/gating.yaml
@ -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}
--- a/SOURCES/macros.clang
+++ b/SOURCES/macros.clang
--- a/SOURCES/release-keys.asc
+++ b/SOURCES/release-keys.asc
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -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
+
--- a/10
+++ b/10
@ -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
--- a/tests/build-gating.fmf
+++ b/tests/build-gating.fmf
@ -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"
--- a/tsa.patch
+++ b/tsa.patch
@ -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;
+ }
+