Date: Thursday, September 29, 2022 @ 19:22:36
Author: foutrelis
Revision: 456995
archrelease: copy trunk to extra-x86_64
Added:
clang/repos/extra-x86_64/PKGBUILD
(from rev 456994, clang/trunk/PKGBUILD)
clang/repos/extra-x86_64/clang-coroutines-ubsan.patch
(from rev 456994, clang/trunk/clang-coroutines-ubsan.patch)
clang/repos/extra-x86_64/clang-tidy-fix-standalone-build.patch
(from rev 456994, clang/trunk/clang-tidy-fix-standalone-build.patch)
clang/repos/extra-x86_64/enable-fstack-protector-strong-by-default.patch
(from rev 456994,
clang/trunk/enable-fstack-protector-strong-by-default.patch)
clang/repos/extra-x86_64/keys/
Deleted:
clang/repos/extra-x86_64/PKGBUILD
clang/repos/extra-x86_64/clang-coroutines-ubsan.patch
clang/repos/extra-x86_64/clang-tidy-fix-standalone-build.patch
clang/repos/extra-x86_64/enable-fstack-protector-strong-by-default.patch
clang/repos/extra-x86_64/keys/
-------------------------------------------------+
PKGBUILD | 289 +++++-----
clang-coroutines-ubsan.patch | 634 +++++++++++-----------
clang-tidy-fix-standalone-build.patch | 16
enable-fstack-protector-strong-by-default.patch | 144 ++--
4 files changed, 542 insertions(+), 541 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-29 19:22:28 UTC (rev 456994)
+++ PKGBUILD 2022-09-29 19:22:36 UTC (rev 456995)
@@ -1,144 +0,0 @@
-# Maintainer: Evangelos Foutras <[email protected]>
-# Contributor: Jan "heftig" Steffens <[email protected]>
-
-pkgname=clang
-pkgver=14.0.6
-pkgrel=2
-pkgdesc="C language family frontend for LLVM"
-arch=('x86_64')
-url="https://clang.llvm.org/";
-license=('custom:Apache 2.0 with LLVM Exception')
-depends=('llvm-libs' 'gcc' 'compiler-rt')
-makedepends=('llvm' 'cmake' 'ninja' 'python-sphinx' 'python-recommonmark')
-optdepends=('openmp: OpenMP support in clang with -fopenmp'
- 'python: for scan-view and git-clang-format'
- 'llvm: referenced by some clang headers')
-provides=("clang-analyzer=$pkgver" "clang-tools-extra=$pkgver")
-conflicts=('clang-analyzer' 'clang-tools-extra')
-replaces=('clang-analyzer' 'clang-tools-extra')
-_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
-source=($_source_base/clang-$pkgver.src.tar.xz{,.sig}
- $_source_base/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
- $_source_base/llvm-$pkgver.src.tar.xz{,.sig}
- clang-coroutines-ubsan.patch
- clang-tidy-fix-standalone-build.patch
- enable-fstack-protector-strong-by-default.patch)
-sha256sums=('2b5847b6a63118b9efe5c85548363c81ffe096b66c3b3675e953e26342ae4031'
- 'SKIP'
- '7cf3b8ff56c65c4d1eae3c56883fc4a6cbc3ff9f3a1530a74d66e45d27271866'
- 'SKIP'
- '050922ecaaca5781fdf6631ea92bc715183f202f9d2f15147226f023414f619a'
- 'SKIP'
- '2c25ddf0ba6be01949842873fef4d285456321aaccd4ba95db61b69a4c580106'
- '081a7ebc1ae524b13fc6be3dc73feb2c9eb7cf4b99f7f13d9ed37a688311f58a'
- '7a9ce949579a3b02d4b91b6835c4fb45adc5f743007572fb0e28e6433e48f3a5')
-validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard
<[email protected]>
-
-# Utilizing LLVM_DISTRIBUTION_COMPONENTS to avoid
-# installing static libraries; inspired by Gentoo
-_get_distribution_components() {
- local target
- ninja -t targets | grep -Po 'install-\K.*(?=-stripped:)' | while read -r
target; do
- case $target in
- clang-libraries|distribution)
- continue
- ;;
- clang-tidy-headers)
- continue
- ;;
- clang|clangd|clang-*)
- ;;
- clang*|findAllSymbols)
- continue
- ;;
- esac
- echo $target
- done
-}
-
-prepare() {
- cd clang-$pkgver.src
- mkdir build
- mv "$srcdir/clang-tools-extra-$pkgver.src" tools/extra
- patch -Np2 -i ../enable-fstack-protector-strong-by-default.patch
-
- # https://github.com/llvm/llvm-project/issues/49689
- patch -Np2 -i ../clang-coroutines-ubsan.patch
-
- # https://github.com/llvm/llvm-project/issues/54116
- patch -Np0 -i ../clang-tidy-fix-standalone-build.patch
-
- # Attempt to convert script to Python 3
- 2to3 -wn --no-diffs \
-
tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-}
-
-build() {
- cd clang-$pkgver.src/build
-
- local cmake_args=(
- -G Ninja
- -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_INSTALL_DOCDIR=share/doc
- -DCMAKE_SKIP_RPATH=ON
- -DCLANG_DEFAULT_PIE_ON_LINUX=ON
- -DCLANG_LINK_CLANG_DYLIB=ON
- -DLLVM_BUILD_DOCS=ON
- -DLLVM_BUILD_TESTS=ON
- -DLLVM_ENABLE_RTTI=ON
- -DLLVM_ENABLE_SPHINX=ON
- -DLLVM_EXTERNAL_LIT=/usr/bin/lit
- -DLLVM_INCLUDE_DOCS=ON
- -DLLVM_LINK_LLVM_DYLIB=ON
- -DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src"
- -DSPHINX_WARNINGS_AS_ERRORS=OFF
- )
-
- cmake .. "${cmake_args[@]}"
- local distribution_components=$(_get_distribution_components | paste -sd\;)
- test -n "$distribution_components"
- cmake_args+=(-DLLVM_DISTRIBUTION_COMPONENTS="$distribution_components")
-
- cmake .. "${cmake_args[@]}"
- ninja
-}
-
-check() {
- cd clang-$pkgver.src/build
- LD_LIBRARY_PATH=$PWD/lib ninja check-clang{,-tools}
-}
-
-_python_optimize() {
- python -m compileall "$@"
- python -O -m compileall "$@"
- python -OO -m compileall "$@"
-}
-
-package() {
- cd clang-$pkgver.src/build
-
- DESTDIR="$pkgdir" ninja install-distribution
- install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- # Remove documentation sources
- rm -r "$pkgdir"/usr/share/doc/clang{,-tools}/html/{_sources,.buildinfo}
-
- # Move scanbuild-py into site-packages and install Python bindings
- local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
- install -d "$pkgdir/$site_packages"
- mv "$pkgdir"/usr/lib/{libear,libscanbuild} "$pkgdir/$site_packages/"
- cp -a ../bindings/python/clang "$pkgdir/$site_packages/"
-
- # Move analyzer scripts out of /usr/libexec
- mv "$pkgdir"/usr/libexec/* "$pkgdir/usr/lib/clang/"
- rmdir "$pkgdir/usr/libexec"
- sed -i 's|libexec|lib/clang|' \
- "$pkgdir/usr/bin/scan-build" \
- "$pkgdir/$site_packages/libscanbuild/analyze.py"
-
- # Compile Python scripts
- _python_optimize "$pkgdir/usr/share" "$pkgdir/$site_packages"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: clang/repos/extra-x86_64/PKGBUILD (from rev 456994,
clang/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-09-29 19:22:36 UTC (rev 456995)
@@ -0,0 +1,145 @@
+# Maintainer: Evangelos Foutras <[email protected]>
+# Contributor: Jan "heftig" Steffens <[email protected]>
+
+pkgname=clang
+pkgver=14.0.6
+pkgrel=3
+pkgdesc="C language family frontend for LLVM"
+arch=('x86_64')
+url="https://clang.llvm.org/";
+license=('custom:Apache 2.0 with LLVM Exception')
+depends=('llvm-libs' 'gcc' 'compiler-rt')
+makedepends=('llvm' 'cmake' 'ninja' 'python-sphinx' 'python-recommonmark')
+optdepends=('openmp: OpenMP support in clang with -fopenmp'
+ 'python: for scan-view and git-clang-format'
+ 'llvm: referenced by some clang headers')
+provides=("clang-analyzer=$pkgver" "clang-tools-extra=$pkgver")
+conflicts=('clang-analyzer' 'clang-tools-extra')
+replaces=('clang-analyzer' 'clang-tools-extra')
+_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
+source=($_source_base/clang-$pkgver.src.tar.xz{,.sig}
+ $_source_base/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
+ $_source_base/llvm-$pkgver.src.tar.xz{,.sig}
+ clang-coroutines-ubsan.patch
+ clang-tidy-fix-standalone-build.patch
+ enable-fstack-protector-strong-by-default.patch)
+sha256sums=('2b5847b6a63118b9efe5c85548363c81ffe096b66c3b3675e953e26342ae4031'
+ 'SKIP'
+ '7cf3b8ff56c65c4d1eae3c56883fc4a6cbc3ff9f3a1530a74d66e45d27271866'
+ 'SKIP'
+ '050922ecaaca5781fdf6631ea92bc715183f202f9d2f15147226f023414f619a'
+ 'SKIP'
+ '2c25ddf0ba6be01949842873fef4d285456321aaccd4ba95db61b69a4c580106'
+ '081a7ebc1ae524b13fc6be3dc73feb2c9eb7cf4b99f7f13d9ed37a688311f58a'
+ '7a9ce949579a3b02d4b91b6835c4fb45adc5f743007572fb0e28e6433e48f3a5')
+validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard
<[email protected]>
+
+# Utilizing LLVM_DISTRIBUTION_COMPONENTS to avoid
+# installing static libraries; inspired by Gentoo
+_get_distribution_components() {
+ local target
+ ninja -t targets | grep -Po 'install-\K.*(?=-stripped:)' | while read -r
target; do
+ case $target in
+ clang-libraries|distribution)
+ continue
+ ;;
+ clang-tidy-headers)
+ continue
+ ;;
+ clang|clangd|clang-*)
+ ;;
+ clang*|findAllSymbols)
+ continue
+ ;;
+ esac
+ echo $target
+ done
+}
+
+prepare() {
+ cd clang-$pkgver.src
+ mkdir build
+ mv "$srcdir/clang-tools-extra-$pkgver.src" tools/extra
+ patch -Np2 -i ../enable-fstack-protector-strong-by-default.patch
+
+ # https://github.com/llvm/llvm-project/issues/49689
+ patch -Np2 -i ../clang-coroutines-ubsan.patch
+
+ # https://github.com/llvm/llvm-project/issues/54116
+ patch -Np0 -i ../clang-tidy-fix-standalone-build.patch
+
+ # Attempt to convert script to Python 3
+ 2to3 -wn --no-diffs \
+
tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+}
+
+build() {
+ cd clang-$pkgver.src/build
+
+ local cmake_args=(
+ -G Ninja
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_DOCDIR=share/doc
+ -DCMAKE_SKIP_RPATH=ON
+ -DCLANG_DEFAULT_PIE_ON_LINUX=ON
+ -DCLANG_LINK_CLANG_DYLIB=ON
+ -DENABLE_LINKER_BUILD_ID=ON
+ -DLLVM_BUILD_DOCS=ON
+ -DLLVM_BUILD_TESTS=ON
+ -DLLVM_ENABLE_RTTI=ON
+ -DLLVM_ENABLE_SPHINX=ON
+ -DLLVM_EXTERNAL_LIT=/usr/bin/lit
+ -DLLVM_INCLUDE_DOCS=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src"
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF
+ )
+
+ cmake .. "${cmake_args[@]}"
+ local distribution_components=$(_get_distribution_components | paste -sd\;)
+ test -n "$distribution_components"
+ cmake_args+=(-DLLVM_DISTRIBUTION_COMPONENTS="$distribution_components")
+
+ cmake .. "${cmake_args[@]}"
+ ninja
+}
+
+check() {
+ cd clang-$pkgver.src/build
+ LD_LIBRARY_PATH=$PWD/lib ninja check-clang{,-tools}
+}
+
+_python_optimize() {
+ python -m compileall "$@"
+ python -O -m compileall "$@"
+ python -OO -m compileall "$@"
+}
+
+package() {
+ cd clang-$pkgver.src/build
+
+ DESTDIR="$pkgdir" ninja install-distribution
+ install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/clang{,-tools}/html/{_sources,.buildinfo}
+
+ # Move scanbuild-py into site-packages and install Python bindings
+ local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
+ install -d "$pkgdir/$site_packages"
+ mv "$pkgdir"/usr/lib/{libear,libscanbuild} "$pkgdir/$site_packages/"
+ cp -a ../bindings/python/clang "$pkgdir/$site_packages/"
+
+ # Move analyzer scripts out of /usr/libexec
+ mv "$pkgdir"/usr/libexec/* "$pkgdir/usr/lib/clang/"
+ rmdir "$pkgdir/usr/libexec"
+ sed -i 's|libexec|lib/clang|' \
+ "$pkgdir/usr/bin/scan-build" \
+ "$pkgdir/$site_packages/libscanbuild/analyze.py"
+
+ # Compile Python scripts
+ _python_optimize "$pkgdir/usr/share" "$pkgdir/$site_packages"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: clang-coroutines-ubsan.patch
===================================================================
--- clang-coroutines-ubsan.patch 2022-09-29 19:22:28 UTC (rev 456994)
+++ clang-coroutines-ubsan.patch 2022-09-29 19:22:36 UTC (rev 456995)
@@ -1,317 +0,0 @@
-From 1030297d77ae5110b7873530f645aeec3a4264ba Mon Sep 17 00:00:00 2001
-From: Yuanfang Chen <[email protected]>
-Date: Mon, 27 Jun 2022 11:33:45 -0700
-Subject: [PATCH] [ubsan] Using metadata instead of prologue data for function
- sanitizer
-
-Information in the function `Prologue Data` is intentionally opaque.
-When a function with `Prologue Data` is duplicated. The self (global
-value) references inside `Prologue Data` is still pointing to the
-original function. This may cause errors like `fatal error: error in backend:
Cannot represent a difference across sections`.
-
-This patch detaches the information from function `Prologue Data`
-and attaches it to a function metadata node.
-
-This and D116130 fix https://github.com/llvm/llvm-project/issues/49689.
-
-Reviewed By: pcc
-
-Differential Revision: https://reviews.llvm.org/D115844
-
-(cherry picked from commit 6678f8e505b19069a9dbdc3e3ee088d543752412)
----
- clang/lib/CodeGen/CodeGenFunction.cpp | 36 ++++--------------
- clang/lib/CodeGen/CodeGenFunction.h | 4 --
- clang/lib/CodeGen/CodeGenModule.cpp | 16 ++++++++
- clang/lib/CodeGen/CodeGenModule.h | 5 +++
- clang/lib/Driver/SanitizerArgs.cpp | 13 +++++++
- clang/test/CodeGen/ubsan-function.cpp | 5 ++-
- .../test/CodeGenCXX/catch-undef-behavior.cpp | 37 +++++++++----------
- .../CodeGenCXX/ubsan-function-noexcept.cpp | 6 ++-
- clang/test/Driver/fsanitize.c | 3 ++
- 9 files changed, 69 insertions(+), 56 deletions(-)
-
-diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp
b/clang/lib/CodeGen/CodeGenFunction.cpp
-index 50e1638924d1..d7393526bb2c 100644
---- a/clang/lib/CodeGen/CodeGenFunction.cpp
-+++ b/clang/lib/CodeGen/CodeGenFunction.cpp
-@@ -560,29 +560,6 @@ bool CodeGenFunction::AlwaysEmitXRayTypedEvents() const {
- XRayInstrKind::Typed);
- }
-
--llvm::Constant *
--CodeGenFunction::EncodeAddrForUseInPrologue(llvm::Function *F,
-- llvm::Constant *Addr) {
-- // Addresses stored in prologue data can't require run-time fixups and must
-- // be PC-relative. Run-time fixups are undesirable because they necessitate
-- // writable text segments, which are unsafe. And absolute addresses are
-- // undesirable because they break PIE mode.
--
-- // Add a layer of indirection through a private global. Taking its address
-- // won't result in a run-time fixup, even if Addr has linkonce_odr linkage.
-- auto *GV = new llvm::GlobalVariable(CGM.getModule(), Addr->getType(),
-- /*isConstant=*/true,
-- llvm::GlobalValue::PrivateLinkage,
Addr);
--
-- // Create a PC-relative address.
-- auto *GOTAsInt = llvm::ConstantExpr::getPtrToInt(GV, IntPtrTy);
-- auto *FuncAsInt = llvm::ConstantExpr::getPtrToInt(F, IntPtrTy);
-- auto *PCRelAsInt = llvm::ConstantExpr::getSub(GOTAsInt, FuncAsInt);
-- return (IntPtrTy == Int32Ty)
-- ? PCRelAsInt
-- : llvm::ConstantExpr::getTrunc(PCRelAsInt, Int32Ty);
--}
--
- llvm::Value *
- CodeGenFunction::DecodeAddrUsedInPrologue(llvm::Value *F,
- llvm::Value *EncodedAddr) {
-@@ -926,12 +903,13 @@ void CodeGenFunction::StartFunction(GlobalDecl GD,
QualType RetTy,
- FD->getType(), EST_None);
- llvm::Constant *FTRTTIConst =
- CGM.GetAddrOfRTTIDescriptor(ProtoTy, /*ForEH=*/true);
-- llvm::Constant *FTRTTIConstEncoded =
-- EncodeAddrForUseInPrologue(Fn, FTRTTIConst);
-- llvm::Constant *PrologueStructElems[] = {PrologueSig,
FTRTTIConstEncoded};
-- llvm::Constant *PrologueStructConst =
-- llvm::ConstantStruct::getAnon(PrologueStructElems, /*Packed=*/true);
-- Fn->setPrologueData(PrologueStructConst);
-+ llvm::GlobalVariable *FTRTTIProxy =
-+ CGM.GetOrCreateRTTIProxyGlobalVariable(FTRTTIConst);
-+ llvm::LLVMContext &Ctx = Fn->getContext();
-+ llvm::MDBuilder MDB(Ctx);
-+ Fn->setMetadata(llvm::LLVMContext::MD_func_sanitize,
-+ MDB.createRTTIPointerPrologue(PrologueSig,
FTRTTIProxy));
-+ CGM.addCompilerUsedGlobal(FTRTTIProxy);
- }
- }
-
-diff --git a/clang/lib/CodeGen/CodeGenFunction.h
b/clang/lib/CodeGen/CodeGenFunction.h
-index df99cd9a1b79..046b249b1aac 100644
---- a/clang/lib/CodeGen/CodeGenFunction.h
-+++ b/clang/lib/CodeGen/CodeGenFunction.h
-@@ -2351,10 +2351,6 @@ public:
- /// XRay typed event handling calls.
- bool AlwaysEmitXRayTypedEvents() const;
-
-- /// Encode an address into a form suitable for use in a function prologue.
-- llvm::Constant *EncodeAddrForUseInPrologue(llvm::Function *F,
-- llvm::Constant *Addr);
--
- /// Decode an address used in a function prologue, encoded by \c
- /// EncodeAddrForUseInPrologue.
- llvm::Value *DecodeAddrUsedInPrologue(llvm::Value *F,
-diff --git a/clang/lib/CodeGen/CodeGenModule.cpp
b/clang/lib/CodeGen/CodeGenModule.cpp
-index 2777fc22600d..58eef1b0fdca 100644
---- a/clang/lib/CodeGen/CodeGenModule.cpp
-+++ b/clang/lib/CodeGen/CodeGenModule.cpp
-@@ -1826,6 +1826,22 @@ CodeGenModule::getMostBaseClasses(const CXXRecordDecl
*RD) {
- return MostBases.takeVector();
- }
-
-+llvm::GlobalVariable *
-+CodeGenModule::GetOrCreateRTTIProxyGlobalVariable(llvm::Constant *Addr) {
-+ auto It = RTTIProxyMap.find(Addr);
-+ if (It != RTTIProxyMap.end())
-+ return It->second;
-+
-+ auto *FTRTTIProxy = new llvm::GlobalVariable(
-+ TheModule, Addr->getType(),
-+ /*isConstant=*/true, llvm::GlobalValue::PrivateLinkage, Addr,
-+ "__llvm_rtti_proxy");
-+ FTRTTIProxy->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
-+
-+ RTTIProxyMap[Addr] = FTRTTIProxy;
-+ return FTRTTIProxy;
-+}
-+
- void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
- llvm::Function *F)
{
- llvm::AttrBuilder B(F->getContext());
-diff --git a/clang/lib/CodeGen/CodeGenModule.h
b/clang/lib/CodeGen/CodeGenModule.h
-index a8a63c8da57f..3a9d542eb2e0 100644
---- a/clang/lib/CodeGen/CodeGenModule.h
-+++ b/clang/lib/CodeGen/CodeGenModule.h
-@@ -561,6 +561,8 @@ private:
- MetadataTypeMap VirtualMetadataIdMap;
- MetadataTypeMap GeneralizedMetadataIdMap;
-
-+ llvm::DenseMap<const llvm::Constant *, llvm::GlobalVariable *> RTTIProxyMap;
-+
- public:
- CodeGenModule(ASTContext &C, const HeaderSearchOptions &headersearchopts,
- const PreprocessorOptions &ppopts,
-@@ -1411,6 +1413,9 @@ public:
- std::vector<const CXXRecordDecl *>
- getMostBaseClasses(const CXXRecordDecl *RD);
-
-+ llvm::GlobalVariable *
-+ GetOrCreateRTTIProxyGlobalVariable(llvm::Constant *Addr);
-+
- /// Get the declaration of std::terminate for the platform.
- llvm::FunctionCallee getTerminateFn();
-
-diff --git a/clang/lib/Driver/SanitizerArgs.cpp
b/clang/lib/Driver/SanitizerArgs.cpp
-index 403fac76f060..96cef9eb80b8 100644
---- a/clang/lib/Driver/SanitizerArgs.cpp
-+++ b/clang/lib/Driver/SanitizerArgs.cpp
-@@ -367,6 +367,19 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
- Add &= ~NotAllowedWithMinimalRuntime;
- }
-
-+ if (llvm::opt::Arg *A = Args.getLastArg(options::OPT_mcmodel_EQ)) {
-+ StringRef CM = A->getValue();
-+ if (CM != "small" &&
-+ (Add & SanitizerKind::Function & ~DiagnosedKinds)) {
-+ if (DiagnoseErrors)
-+ D.Diag(diag::err_drv_argument_only_allowed_with)
-+ << "-fsanitize=function"
-+ << "-mcmodel=small";
-+ Add &= ~SanitizerKind::Function;
-+ DiagnosedKinds |= SanitizerKind::Function;
-+ }
-+ }
-+
- // FIXME: Make CFI on member function calls compatible with cross-DSO
CFI.
- // There are currently two problems:
- // - Virtual function call checks need to pass a pointer to the function
-diff --git a/clang/test/CodeGen/ubsan-function.cpp
b/clang/test/CodeGen/ubsan-function.cpp
-index 2466d8a2645d..8a16dfdf5da1 100644
---- a/clang/test/CodeGen/ubsan-function.cpp
-+++ b/clang/test/CodeGen/ubsan-function.cpp
-@@ -1,6 +1,7 @@
- // RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
-
--// CHECK-LABEL: define{{.*}} void @_Z3funv() #0 prologue <{ i32, i32 }> <{
i32 846595819, i32 trunc (i64 sub (i64 ptrtoint (i8** @0 to i64), i64 ptrtoint
(void ()* @_Z3funv to i64)) to i32) }> {
-+// CHECK: @[[PROXY:.*]] = private unnamed_addr constant i8* bitcast ({ i8*,
i8* }* @_ZTIFvvE to i8*)
-+// CHECK: define{{.*}} void @_Z3funv() #0 !func_sanitize ![[FUNCSAN:.*]] {
- void fun() {}
-
- // CHECK-LABEL: define{{.*}} void @_Z6callerPFvvE(void ()* noundef %f)
-@@ -20,3 +21,5 @@ void fun() {}
- // CHECK: [[LABEL3]]:
- // CHECK: br label %[[LABEL4]], !nosanitize
- void caller(void (*f)()) { f(); }
-+
-+// CHECK: ![[FUNCSAN]] = !{i32 846595819, i8** @[[PROXY]]}
-diff --git a/clang/test/CodeGenCXX/catch-undef-behavior.cpp
b/clang/test/CodeGenCXX/catch-undef-behavior.cpp
-index d6b094cb5b82..ade29797f5a0 100644
---- a/clang/test/CodeGenCXX/catch-undef-behavior.cpp
-+++ b/clang/test/CodeGenCXX/catch-undef-behavior.cpp
-@@ -1,8 +1,8 @@
--// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11
-fsanitize=signed-integer-overflow,integer-divide-by-zero,float-divide-by-zero,shift-base,shift-exponent,unreachable,return,vla-bound,alignment,null,vptr,object-size,float-cast-overflow,bool,enum,array-bounds,function
-fsanitize-recover=signed-integer-overflow,integer-divide-by-zero,float-divide-by-zero,shift-base,shift-exponent,vla-bound,alignment,null,vptr,object-size,float-cast-overflow,bool,enum,array-bounds,function
-emit-llvm %s -o - -triple x86_64-linux-gnu | opt -instnamer -S | FileCheck %s
-+// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11
-fsanitize=signed-integer-overflow,integer-divide-by-zero,float-divide-by-zero,shift-base,shift-exponent,unreachable,return,vla-bound,alignment,null,vptr,object-size,float-cast-overflow,bool,enum,array-bounds,function
-fsanitize-recover=signed-integer-overflow,integer-divide-by-zero,float-divide-by-zero,shift-base,shift-exponent,vla-bound,alignment,null,vptr,object-size,float-cast-overflow,bool,enum,array-bounds,function
-emit-llvm %s -o - -triple x86_64-linux-gnu | opt -instnamer -S | FileCheck %s
--check-prefixes=CHECK,CHECK-FUNCSAN
- // RUN: %clang_cc1 -disable-noundef-analysis -std=c++11
-fsanitize=vptr,address -fsanitize-recover=vptr,address -emit-llvm %s -o -
-triple x86_64-linux-gnu | FileCheck %s --check-prefix=CHECK-ASAN
- // RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=vptr
-fsanitize-recover=vptr -emit-llvm %s -o - -triple x86_64-linux-gnu | FileCheck
%s --check-prefix=DOWNCAST-NULL
--// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=function
-emit-llvm %s -o - -triple x86_64-linux-gnux32 | FileCheck %s
--check-prefix=CHECK-X32
--// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=function
-emit-llvm %s -o - -triple i386-linux-gnu | FileCheck %s
--check-prefix=CHECK-X86
-+// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=function
-emit-llvm %s -o - -triple x86_64-linux-gnux32 | FileCheck %s
--check-prefix=CHECK-FUNCSAN
-+// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=function
-emit-llvm %s -o - -triple i386-linux-gnu | FileCheck %s
--check-prefix=CHECK-FUNCSAN
-
- struct S {
- double d;
-@@ -16,9 +16,7 @@ struct S {
- // Check that type mismatch handler is not modified by ASan.
- // CHECK-ASAN: private unnamed_addr global { { [{{.*}} x i8]*, i32, i32 }, {
i16, i16, [4 x i8] }*, i8*, i8 } { {{.*}}, { i16, i16, [4 x i8] }*
[[TYPE_DESCR]], {{.*}} }
-
--// CHECK: [[IndirectRTTI_ZTIFvPFviEE:@.+]] = private constant i8* bitcast ({
i8*, i8* }* @_ZTIFvPFviEE to i8*)
--// CHECK-X86: [[IndirectRTTI_ZTIFvPFviEE:@.+]] = private constant i8* bitcast
({ i8*, i8* }* @_ZTIFvPFviEE to i8*)
--// CHECK-X32: [[IndirectRTTI_ZTIFvPFviEE:@.+]] = private constant i8* bitcast
({ i8*, i8* }* @_ZTIFvPFviEE to i8*)
-+// CHECK-FUNCSAN: [[PROXY:@.+]] = private unnamed_addr constant i8* bitcast
({ i8*, i8* }* @_ZTIFvPFviEE to i8*)
-
- struct T : S {};
-
-@@ -399,10 +397,7 @@ void downcast_reference(B &b) {
- // CHECK-NEXT: br i1 [[AND]]
- }
-
--//
--// CHECK-LABEL: @_Z22indirect_function_callPFviE({{.*}} prologue <{ i32, i32
}> <{ i32 846595819, i32 trunc (i64 sub (i64 ptrtoint (i8** {{.*}} to i64), i64
ptrtoint (void (void (i32)*)* @_Z22indirect_function_callPFviE to i64)) to i32)
}>
--// CHECK-X32: @_Z22indirect_function_callPFviE({{.*}} prologue <{ i32, i32 }>
<{ i32 846595819, i32 sub (i32 ptrtoint (i8** [[IndirectRTTI_ZTIFvPFviEE]] to
i32), i32 ptrtoint (void (void (i32)*)* @_Z22indirect_function_callPFviE to
i32)) }>
--// CHECK-X86: @_Z22indirect_function_callPFviE({{.*}} prologue <{ i32, i32 }>
<{ i32 846595819, i32 sub (i32 ptrtoint (i8** [[IndirectRTTI_ZTIFvPFviEE]] to
i32), i32 ptrtoint (void (void (i32)*)* @_Z22indirect_function_callPFviE to
i32)) }>
-+// CHECK-FUNCSAN: @_Z22indirect_function_callPFviE({{.*}} !func_sanitize
![[FUNCSAN:.*]] {
- void indirect_function_call(void (*p)(int)) {
- // CHECK: [[PTR:%.+]] = bitcast void (i32)* {{.*}} to <{ i32, i32 }>*
-
-@@ -483,34 +478,34 @@ void force_irgen() {
- }
-
- // CHECK-LABEL: define{{.*}} void @_ZN29FunctionSanitizerVirtualCalls1B1fEv
--// CHECK-NOT: prologue
-+// CHECK-NOT: !func_sanitize
- //
- // CHECK-LABEL: define{{.*}} void
@_ZTv0_n24_N29FunctionSanitizerVirtualCalls1B1fEv
--// CHECK-NOT: prologue
-+// CHECK-NOT: !func_sanitize
- //
- // CHECK-LABEL: define{{.*}} void
@_ZN29FunctionSanitizerVirtualCalls11force_irgenEv()
--// CHECK: prologue
-+// CHECK: !func_sanitize
- //
- // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1AC1Ev
--// CHECK-NOT: prologue
-+// CHECK-NOT: !func_sanitize
- //
- // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1A1gEv
--// CHECK-NOT: prologue
-+// CHECK-NOT: !func_sanitize
- //
- // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1A1hEv
--// CHECK-NOT: prologue
-+// CHECK-NOT: !func_sanitize
- //
- // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1BC1Ev
--// CHECK-NOT: prologue
-+// CHECK-NOT: !func_sanitize
- //
- // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1B1bEv
--// CHECK-NOT: prologue
-+// CHECK-NOT: !func_sanitize
- //
- // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1B1gEv
--// CHECK-NOT: prologue
-+// CHECK-NOT: !func_sanitize
- //
- // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1B1qEv
--// CHECK: prologue
-+// CHECK: !func_sanitize
-
- }
-
-@@ -754,3 +749,5 @@ void ThisAlign::this_align_lambda_2() {
- }
-
- // CHECK: attributes [[NR_NUW]] = { noreturn nounwind }
-+
-+// CHECK-FUNCSAN: ![[FUNCSAN]] = !{i32 846595819, i8** [[PROXY]]}
-diff --git a/clang/test/CodeGenCXX/ubsan-function-noexcept.cpp
b/clang/test/CodeGenCXX/ubsan-function-noexcept.cpp
-index 3c0c0e8be91f..9d5eb1edefe5 100644
---- a/clang/test/CodeGenCXX/ubsan-function-noexcept.cpp
-+++ b/clang/test/CodeGenCXX/ubsan-function-noexcept.cpp
-@@ -2,8 +2,8 @@
-
- // Check that typeinfo recorded in function prolog doesn't have "Do" noexcept
- // qualifier in its mangled name.
--// CHECK: @[[RTTI:[0-9]+]] = private constant i8* bitcast ({ i8*, i8* }*
@_ZTIFvvE to i8*)
--// CHECK: define{{.*}} void @_Z1fv() #{{.*}} prologue <{ i32, i32 }> <{ i32
{{.*}}, i32 trunc (i64 sub (i64 ptrtoint (i8** @[[RTTI]] to i64), i64 ptrtoint
(void ()* @_Z1fv to i64)) to i32) }>
-+// CHECK: [[PROXY:@.*]] = private unnamed_addr constant i8* bitcast ({ i8*,
i8* }* @_ZTIFvvE to i8*)
-+// CHECK: define{{.*}} void @_Z1fv() #{{.*}} !func_sanitize ![[FUNCSAN:.*]] {
- void f() noexcept {}
-
- // CHECK: define{{.*}} void @_Z1gPDoFvvE
-@@ -13,3 +13,5 @@ void g(void (*p)() noexcept) {
- // CHECK: icmp eq i8* %{{.*}}, bitcast ({ i8*, i8* }* @_ZTIFvvE to i8*),
!nosanitize
- p();
- }
-+
-+// CHECK: ![[FUNCSAN]] = !{i32 846595819, i8** [[PROXY]]}
-diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
-index 17fce1981eea..624dc98478ec 100644
---- a/clang/test/Driver/fsanitize.c
-+++ b/clang/test/Driver/fsanitize.c
-@@ -915,3 +915,6 @@
-
- // RUN: %clang -fsanitize=undefined,float-divide-by-zero %s -### 2>&1 |
FileCheck %s --check-prefix=CHECK-DIVBYZERO-UBSAN
- // CHECK-DIVBYZERO-UBSAN: "-fsanitize={{.*}},float-divide-by-zero,{{.*}}"
-+
-+// RUN: %clang -target x86_64-linux-gnu -fsanitize=undefined,function
-mcmodel=large %s -### 2>&1 | FileCheck %s
--check-prefix=CHECK-UBSAN-FUNCTION-CODE-MODEL
-+// CHECK-UBSAN-FUNCTION-CODE-MODEL: error: invalid argument
'-fsanitize=function' only allowed with '-mcmodel=small'
Copied: clang/repos/extra-x86_64/clang-coroutines-ubsan.patch (from rev 456994,
clang/trunk/clang-coroutines-ubsan.patch)
===================================================================
--- clang-coroutines-ubsan.patch (rev 0)
+++ clang-coroutines-ubsan.patch 2022-09-29 19:22:36 UTC (rev 456995)
@@ -0,0 +1,317 @@
+From 1030297d77ae5110b7873530f645aeec3a4264ba Mon Sep 17 00:00:00 2001
+From: Yuanfang Chen <[email protected]>
+Date: Mon, 27 Jun 2022 11:33:45 -0700
+Subject: [PATCH] [ubsan] Using metadata instead of prologue data for function
+ sanitizer
+
+Information in the function `Prologue Data` is intentionally opaque.
+When a function with `Prologue Data` is duplicated. The self (global
+value) references inside `Prologue Data` is still pointing to the
+original function. This may cause errors like `fatal error: error in backend:
Cannot represent a difference across sections`.
+
+This patch detaches the information from function `Prologue Data`
+and attaches it to a function metadata node.
+
+This and D116130 fix https://github.com/llvm/llvm-project/issues/49689.
+
+Reviewed By: pcc
+
+Differential Revision: https://reviews.llvm.org/D115844
+
+(cherry picked from commit 6678f8e505b19069a9dbdc3e3ee088d543752412)
+---
+ clang/lib/CodeGen/CodeGenFunction.cpp | 36 ++++--------------
+ clang/lib/CodeGen/CodeGenFunction.h | 4 --
+ clang/lib/CodeGen/CodeGenModule.cpp | 16 ++++++++
+ clang/lib/CodeGen/CodeGenModule.h | 5 +++
+ clang/lib/Driver/SanitizerArgs.cpp | 13 +++++++
+ clang/test/CodeGen/ubsan-function.cpp | 5 ++-
+ .../test/CodeGenCXX/catch-undef-behavior.cpp | 37 +++++++++----------
+ .../CodeGenCXX/ubsan-function-noexcept.cpp | 6 ++-
+ clang/test/Driver/fsanitize.c | 3 ++
+ 9 files changed, 69 insertions(+), 56 deletions(-)
+
+diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp
b/clang/lib/CodeGen/CodeGenFunction.cpp
+index 50e1638924d1..d7393526bb2c 100644
+--- a/clang/lib/CodeGen/CodeGenFunction.cpp
++++ b/clang/lib/CodeGen/CodeGenFunction.cpp
+@@ -560,29 +560,6 @@ bool CodeGenFunction::AlwaysEmitXRayTypedEvents() const {
+ XRayInstrKind::Typed);
+ }
+
+-llvm::Constant *
+-CodeGenFunction::EncodeAddrForUseInPrologue(llvm::Function *F,
+- llvm::Constant *Addr) {
+- // Addresses stored in prologue data can't require run-time fixups and must
+- // be PC-relative. Run-time fixups are undesirable because they necessitate
+- // writable text segments, which are unsafe. And absolute addresses are
+- // undesirable because they break PIE mode.
+-
+- // Add a layer of indirection through a private global. Taking its address
+- // won't result in a run-time fixup, even if Addr has linkonce_odr linkage.
+- auto *GV = new llvm::GlobalVariable(CGM.getModule(), Addr->getType(),
+- /*isConstant=*/true,
+- llvm::GlobalValue::PrivateLinkage,
Addr);
+-
+- // Create a PC-relative address.
+- auto *GOTAsInt = llvm::ConstantExpr::getPtrToInt(GV, IntPtrTy);
+- auto *FuncAsInt = llvm::ConstantExpr::getPtrToInt(F, IntPtrTy);
+- auto *PCRelAsInt = llvm::ConstantExpr::getSub(GOTAsInt, FuncAsInt);
+- return (IntPtrTy == Int32Ty)
+- ? PCRelAsInt
+- : llvm::ConstantExpr::getTrunc(PCRelAsInt, Int32Ty);
+-}
+-
+ llvm::Value *
+ CodeGenFunction::DecodeAddrUsedInPrologue(llvm::Value *F,
+ llvm::Value *EncodedAddr) {
+@@ -926,12 +903,13 @@ void CodeGenFunction::StartFunction(GlobalDecl GD,
QualType RetTy,
+ FD->getType(), EST_None);
+ llvm::Constant *FTRTTIConst =
+ CGM.GetAddrOfRTTIDescriptor(ProtoTy, /*ForEH=*/true);
+- llvm::Constant *FTRTTIConstEncoded =
+- EncodeAddrForUseInPrologue(Fn, FTRTTIConst);
+- llvm::Constant *PrologueStructElems[] = {PrologueSig,
FTRTTIConstEncoded};
+- llvm::Constant *PrologueStructConst =
+- llvm::ConstantStruct::getAnon(PrologueStructElems, /*Packed=*/true);
+- Fn->setPrologueData(PrologueStructConst);
++ llvm::GlobalVariable *FTRTTIProxy =
++ CGM.GetOrCreateRTTIProxyGlobalVariable(FTRTTIConst);
++ llvm::LLVMContext &Ctx = Fn->getContext();
++ llvm::MDBuilder MDB(Ctx);
++ Fn->setMetadata(llvm::LLVMContext::MD_func_sanitize,
++ MDB.createRTTIPointerPrologue(PrologueSig,
FTRTTIProxy));
++ CGM.addCompilerUsedGlobal(FTRTTIProxy);
+ }
+ }
+
+diff --git a/clang/lib/CodeGen/CodeGenFunction.h
b/clang/lib/CodeGen/CodeGenFunction.h
+index df99cd9a1b79..046b249b1aac 100644
+--- a/clang/lib/CodeGen/CodeGenFunction.h
++++ b/clang/lib/CodeGen/CodeGenFunction.h
+@@ -2351,10 +2351,6 @@ public:
+ /// XRay typed event handling calls.
+ bool AlwaysEmitXRayTypedEvents() const;
+
+- /// Encode an address into a form suitable for use in a function prologue.
+- llvm::Constant *EncodeAddrForUseInPrologue(llvm::Function *F,
+- llvm::Constant *Addr);
+-
+ /// Decode an address used in a function prologue, encoded by \c
+ /// EncodeAddrForUseInPrologue.
+ llvm::Value *DecodeAddrUsedInPrologue(llvm::Value *F,
+diff --git a/clang/lib/CodeGen/CodeGenModule.cpp
b/clang/lib/CodeGen/CodeGenModule.cpp
+index 2777fc22600d..58eef1b0fdca 100644
+--- a/clang/lib/CodeGen/CodeGenModule.cpp
++++ b/clang/lib/CodeGen/CodeGenModule.cpp
+@@ -1826,6 +1826,22 @@ CodeGenModule::getMostBaseClasses(const CXXRecordDecl
*RD) {
+ return MostBases.takeVector();
+ }
+
++llvm::GlobalVariable *
++CodeGenModule::GetOrCreateRTTIProxyGlobalVariable(llvm::Constant *Addr) {
++ auto It = RTTIProxyMap.find(Addr);
++ if (It != RTTIProxyMap.end())
++ return It->second;
++
++ auto *FTRTTIProxy = new llvm::GlobalVariable(
++ TheModule, Addr->getType(),
++ /*isConstant=*/true, llvm::GlobalValue::PrivateLinkage, Addr,
++ "__llvm_rtti_proxy");
++ FTRTTIProxy->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
++
++ RTTIProxyMap[Addr] = FTRTTIProxy;
++ return FTRTTIProxy;
++}
++
+ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
+ llvm::Function *F)
{
+ llvm::AttrBuilder B(F->getContext());
+diff --git a/clang/lib/CodeGen/CodeGenModule.h
b/clang/lib/CodeGen/CodeGenModule.h
+index a8a63c8da57f..3a9d542eb2e0 100644
+--- a/clang/lib/CodeGen/CodeGenModule.h
++++ b/clang/lib/CodeGen/CodeGenModule.h
+@@ -561,6 +561,8 @@ private:
+ MetadataTypeMap VirtualMetadataIdMap;
+ MetadataTypeMap GeneralizedMetadataIdMap;
+
++ llvm::DenseMap<const llvm::Constant *, llvm::GlobalVariable *> RTTIProxyMap;
++
+ public:
+ CodeGenModule(ASTContext &C, const HeaderSearchOptions &headersearchopts,
+ const PreprocessorOptions &ppopts,
+@@ -1411,6 +1413,9 @@ public:
+ std::vector<const CXXRecordDecl *>
+ getMostBaseClasses(const CXXRecordDecl *RD);
+
++ llvm::GlobalVariable *
++ GetOrCreateRTTIProxyGlobalVariable(llvm::Constant *Addr);
++
+ /// Get the declaration of std::terminate for the platform.
+ llvm::FunctionCallee getTerminateFn();
+
+diff --git a/clang/lib/Driver/SanitizerArgs.cpp
b/clang/lib/Driver/SanitizerArgs.cpp
+index 403fac76f060..96cef9eb80b8 100644
+--- a/clang/lib/Driver/SanitizerArgs.cpp
++++ b/clang/lib/Driver/SanitizerArgs.cpp
+@@ -367,6 +367,19 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
+ Add &= ~NotAllowedWithMinimalRuntime;
+ }
+
++ if (llvm::opt::Arg *A = Args.getLastArg(options::OPT_mcmodel_EQ)) {
++ StringRef CM = A->getValue();
++ if (CM != "small" &&
++ (Add & SanitizerKind::Function & ~DiagnosedKinds)) {
++ if (DiagnoseErrors)
++ D.Diag(diag::err_drv_argument_only_allowed_with)
++ << "-fsanitize=function"
++ << "-mcmodel=small";
++ Add &= ~SanitizerKind::Function;
++ DiagnosedKinds |= SanitizerKind::Function;
++ }
++ }
++
+ // FIXME: Make CFI on member function calls compatible with cross-DSO
CFI.
+ // There are currently two problems:
+ // - Virtual function call checks need to pass a pointer to the function
+diff --git a/clang/test/CodeGen/ubsan-function.cpp
b/clang/test/CodeGen/ubsan-function.cpp
+index 2466d8a2645d..8a16dfdf5da1 100644
+--- a/clang/test/CodeGen/ubsan-function.cpp
++++ b/clang/test/CodeGen/ubsan-function.cpp
+@@ -1,6 +1,7 @@
+ // RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %s
-fsanitize=function -fno-sanitize-recover=all | FileCheck %s
+
+-// CHECK-LABEL: define{{.*}} void @_Z3funv() #0 prologue <{ i32, i32 }> <{
i32 846595819, i32 trunc (i64 sub (i64 ptrtoint (i8** @0 to i64), i64 ptrtoint
(void ()* @_Z3funv to i64)) to i32) }> {
++// CHECK: @[[PROXY:.*]] = private unnamed_addr constant i8* bitcast ({ i8*,
i8* }* @_ZTIFvvE to i8*)
++// CHECK: define{{.*}} void @_Z3funv() #0 !func_sanitize ![[FUNCSAN:.*]] {
+ void fun() {}
+
+ // CHECK-LABEL: define{{.*}} void @_Z6callerPFvvE(void ()* noundef %f)
+@@ -20,3 +21,5 @@ void fun() {}
+ // CHECK: [[LABEL3]]:
+ // CHECK: br label %[[LABEL4]], !nosanitize
+ void caller(void (*f)()) { f(); }
++
++// CHECK: ![[FUNCSAN]] = !{i32 846595819, i8** @[[PROXY]]}
+diff --git a/clang/test/CodeGenCXX/catch-undef-behavior.cpp
b/clang/test/CodeGenCXX/catch-undef-behavior.cpp
+index d6b094cb5b82..ade29797f5a0 100644
+--- a/clang/test/CodeGenCXX/catch-undef-behavior.cpp
++++ b/clang/test/CodeGenCXX/catch-undef-behavior.cpp
+@@ -1,8 +1,8 @@
+-// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11
-fsanitize=signed-integer-overflow,integer-divide-by-zero,float-divide-by-zero,shift-base,shift-exponent,unreachable,return,vla-bound,alignment,null,vptr,object-size,float-cast-overflow,bool,enum,array-bounds,function
-fsanitize-recover=signed-integer-overflow,integer-divide-by-zero,float-divide-by-zero,shift-base,shift-exponent,vla-bound,alignment,null,vptr,object-size,float-cast-overflow,bool,enum,array-bounds,function
-emit-llvm %s -o - -triple x86_64-linux-gnu | opt -instnamer -S | FileCheck %s
++// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11
-fsanitize=signed-integer-overflow,integer-divide-by-zero,float-divide-by-zero,shift-base,shift-exponent,unreachable,return,vla-bound,alignment,null,vptr,object-size,float-cast-overflow,bool,enum,array-bounds,function
-fsanitize-recover=signed-integer-overflow,integer-divide-by-zero,float-divide-by-zero,shift-base,shift-exponent,vla-bound,alignment,null,vptr,object-size,float-cast-overflow,bool,enum,array-bounds,function
-emit-llvm %s -o - -triple x86_64-linux-gnu | opt -instnamer -S | FileCheck %s
--check-prefixes=CHECK,CHECK-FUNCSAN
+ // RUN: %clang_cc1 -disable-noundef-analysis -std=c++11
-fsanitize=vptr,address -fsanitize-recover=vptr,address -emit-llvm %s -o -
-triple x86_64-linux-gnu | FileCheck %s --check-prefix=CHECK-ASAN
+ // RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=vptr
-fsanitize-recover=vptr -emit-llvm %s -o - -triple x86_64-linux-gnu | FileCheck
%s --check-prefix=DOWNCAST-NULL
+-// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=function
-emit-llvm %s -o - -triple x86_64-linux-gnux32 | FileCheck %s
--check-prefix=CHECK-X32
+-// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=function
-emit-llvm %s -o - -triple i386-linux-gnu | FileCheck %s
--check-prefix=CHECK-X86
++// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=function
-emit-llvm %s -o - -triple x86_64-linux-gnux32 | FileCheck %s
--check-prefix=CHECK-FUNCSAN
++// RUN: %clang_cc1 -disable-noundef-analysis -std=c++11 -fsanitize=function
-emit-llvm %s -o - -triple i386-linux-gnu | FileCheck %s
--check-prefix=CHECK-FUNCSAN
+
+ struct S {
+ double d;
+@@ -16,9 +16,7 @@ struct S {
+ // Check that type mismatch handler is not modified by ASan.
+ // CHECK-ASAN: private unnamed_addr global { { [{{.*}} x i8]*, i32, i32 }, {
i16, i16, [4 x i8] }*, i8*, i8 } { {{.*}}, { i16, i16, [4 x i8] }*
[[TYPE_DESCR]], {{.*}} }
+
+-// CHECK: [[IndirectRTTI_ZTIFvPFviEE:@.+]] = private constant i8* bitcast ({
i8*, i8* }* @_ZTIFvPFviEE to i8*)
+-// CHECK-X86: [[IndirectRTTI_ZTIFvPFviEE:@.+]] = private constant i8* bitcast
({ i8*, i8* }* @_ZTIFvPFviEE to i8*)
+-// CHECK-X32: [[IndirectRTTI_ZTIFvPFviEE:@.+]] = private constant i8* bitcast
({ i8*, i8* }* @_ZTIFvPFviEE to i8*)
++// CHECK-FUNCSAN: [[PROXY:@.+]] = private unnamed_addr constant i8* bitcast
({ i8*, i8* }* @_ZTIFvPFviEE to i8*)
+
+ struct T : S {};
+
+@@ -399,10 +397,7 @@ void downcast_reference(B &b) {
+ // CHECK-NEXT: br i1 [[AND]]
+ }
+
+-//
+-// CHECK-LABEL: @_Z22indirect_function_callPFviE({{.*}} prologue <{ i32, i32
}> <{ i32 846595819, i32 trunc (i64 sub (i64 ptrtoint (i8** {{.*}} to i64), i64
ptrtoint (void (void (i32)*)* @_Z22indirect_function_callPFviE to i64)) to i32)
}>
+-// CHECK-X32: @_Z22indirect_function_callPFviE({{.*}} prologue <{ i32, i32 }>
<{ i32 846595819, i32 sub (i32 ptrtoint (i8** [[IndirectRTTI_ZTIFvPFviEE]] to
i32), i32 ptrtoint (void (void (i32)*)* @_Z22indirect_function_callPFviE to
i32)) }>
+-// CHECK-X86: @_Z22indirect_function_callPFviE({{.*}} prologue <{ i32, i32 }>
<{ i32 846595819, i32 sub (i32 ptrtoint (i8** [[IndirectRTTI_ZTIFvPFviEE]] to
i32), i32 ptrtoint (void (void (i32)*)* @_Z22indirect_function_callPFviE to
i32)) }>
++// CHECK-FUNCSAN: @_Z22indirect_function_callPFviE({{.*}} !func_sanitize
![[FUNCSAN:.*]] {
+ void indirect_function_call(void (*p)(int)) {
+ // CHECK: [[PTR:%.+]] = bitcast void (i32)* {{.*}} to <{ i32, i32 }>*
+
+@@ -483,34 +478,34 @@ void force_irgen() {
+ }
+
+ // CHECK-LABEL: define{{.*}} void @_ZN29FunctionSanitizerVirtualCalls1B1fEv
+-// CHECK-NOT: prologue
++// CHECK-NOT: !func_sanitize
+ //
+ // CHECK-LABEL: define{{.*}} void
@_ZTv0_n24_N29FunctionSanitizerVirtualCalls1B1fEv
+-// CHECK-NOT: prologue
++// CHECK-NOT: !func_sanitize
+ //
+ // CHECK-LABEL: define{{.*}} void
@_ZN29FunctionSanitizerVirtualCalls11force_irgenEv()
+-// CHECK: prologue
++// CHECK: !func_sanitize
+ //
+ // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1AC1Ev
+-// CHECK-NOT: prologue
++// CHECK-NOT: !func_sanitize
+ //
+ // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1A1gEv
+-// CHECK-NOT: prologue
++// CHECK-NOT: !func_sanitize
+ //
+ // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1A1hEv
+-// CHECK-NOT: prologue
++// CHECK-NOT: !func_sanitize
+ //
+ // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1BC1Ev
+-// CHECK-NOT: prologue
++// CHECK-NOT: !func_sanitize
+ //
+ // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1B1bEv
+-// CHECK-NOT: prologue
++// CHECK-NOT: !func_sanitize
+ //
+ // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1B1gEv
+-// CHECK-NOT: prologue
++// CHECK-NOT: !func_sanitize
+ //
+ // CHECK-LABEL: define linkonce_odr void
@_ZN29FunctionSanitizerVirtualCalls1B1qEv
+-// CHECK: prologue
++// CHECK: !func_sanitize
+
+ }
+
+@@ -754,3 +749,5 @@ void ThisAlign::this_align_lambda_2() {
+ }
+
+ // CHECK: attributes [[NR_NUW]] = { noreturn nounwind }
++
++// CHECK-FUNCSAN: ![[FUNCSAN]] = !{i32 846595819, i8** [[PROXY]]}
+diff --git a/clang/test/CodeGenCXX/ubsan-function-noexcept.cpp
b/clang/test/CodeGenCXX/ubsan-function-noexcept.cpp
+index 3c0c0e8be91f..9d5eb1edefe5 100644
+--- a/clang/test/CodeGenCXX/ubsan-function-noexcept.cpp
++++ b/clang/test/CodeGenCXX/ubsan-function-noexcept.cpp
+@@ -2,8 +2,8 @@
+
+ // Check that typeinfo recorded in function prolog doesn't have "Do" noexcept
+ // qualifier in its mangled name.
+-// CHECK: @[[RTTI:[0-9]+]] = private constant i8* bitcast ({ i8*, i8* }*
@_ZTIFvvE to i8*)
+-// CHECK: define{{.*}} void @_Z1fv() #{{.*}} prologue <{ i32, i32 }> <{ i32
{{.*}}, i32 trunc (i64 sub (i64 ptrtoint (i8** @[[RTTI]] to i64), i64 ptrtoint
(void ()* @_Z1fv to i64)) to i32) }>
++// CHECK: [[PROXY:@.*]] = private unnamed_addr constant i8* bitcast ({ i8*,
i8* }* @_ZTIFvvE to i8*)
++// CHECK: define{{.*}} void @_Z1fv() #{{.*}} !func_sanitize ![[FUNCSAN:.*]] {
+ void f() noexcept {}
+
+ // CHECK: define{{.*}} void @_Z1gPDoFvvE
+@@ -13,3 +13,5 @@ void g(void (*p)() noexcept) {
+ // CHECK: icmp eq i8* %{{.*}}, bitcast ({ i8*, i8* }* @_ZTIFvvE to i8*),
!nosanitize
+ p();
+ }
++
++// CHECK: ![[FUNCSAN]] = !{i32 846595819, i8** [[PROXY]]}
+diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
+index 17fce1981eea..624dc98478ec 100644
+--- a/clang/test/Driver/fsanitize.c
++++ b/clang/test/Driver/fsanitize.c
+@@ -915,3 +915,6 @@
+
+ // RUN: %clang -fsanitize=undefined,float-divide-by-zero %s -### 2>&1 |
FileCheck %s --check-prefix=CHECK-DIVBYZERO-UBSAN
+ // CHECK-DIVBYZERO-UBSAN: "-fsanitize={{.*}},float-divide-by-zero,{{.*}}"
++
++// RUN: %clang -target x86_64-linux-gnu -fsanitize=undefined,function
-mcmodel=large %s -### 2>&1 | FileCheck %s
--check-prefix=CHECK-UBSAN-FUNCTION-CODE-MODEL
++// CHECK-UBSAN-FUNCTION-CODE-MODEL: error: invalid argument
'-fsanitize=function' only allowed with '-mcmodel=small'
Deleted: clang-tidy-fix-standalone-build.patch
===================================================================
--- clang-tidy-fix-standalone-build.patch 2022-09-29 19:22:28 UTC (rev
456994)
+++ clang-tidy-fix-standalone-build.patch 2022-09-29 19:22:36 UTC (rev
456995)
@@ -1,8 +0,0 @@
---- tools/extra/unittests/clang-tidy/ReadabilityModuleTest.cpp.orig
2022-04-24 02:31:36.544185904 +0000
-+++ tools/extra/unittests/clang-tidy/ReadabilityModuleTest.cpp 2022-04-24
02:32:20.390088782 +0000
-@@ -1,4 +1,4 @@
--#include "../../clang/unittests/ASTMatchers/ASTMatchersTest.h"
-+#include "../../../../unittests/ASTMatchers/ASTMatchersTest.h"
- #include "ClangTidyTest.h"
- #include "readability/BracesAroundStatementsCheck.h"
- #include "readability/NamespaceCommentCheck.h"
Copied: clang/repos/extra-x86_64/clang-tidy-fix-standalone-build.patch (from
rev 456994, clang/trunk/clang-tidy-fix-standalone-build.patch)
===================================================================
--- clang-tidy-fix-standalone-build.patch (rev 0)
+++ clang-tidy-fix-standalone-build.patch 2022-09-29 19:22:36 UTC (rev
456995)
@@ -0,0 +1,8 @@
+--- tools/extra/unittests/clang-tidy/ReadabilityModuleTest.cpp.orig
2022-04-24 02:31:36.544185904 +0000
++++ tools/extra/unittests/clang-tidy/ReadabilityModuleTest.cpp 2022-04-24
02:32:20.390088782 +0000
+@@ -1,4 +1,4 @@
+-#include "../../clang/unittests/ASTMatchers/ASTMatchersTest.h"
++#include "../../../../unittests/ASTMatchers/ASTMatchersTest.h"
+ #include "ClangTidyTest.h"
+ #include "readability/BracesAroundStatementsCheck.h"
+ #include "readability/NamespaceCommentCheck.h"
Deleted: enable-fstack-protector-strong-by-default.patch
===================================================================
--- enable-fstack-protector-strong-by-default.patch 2022-09-29 19:22:28 UTC
(rev 456994)
+++ enable-fstack-protector-strong-by-default.patch 2022-09-29 19:22:36 UTC
(rev 456995)
@@ -1,72 +0,0 @@
-From 75c02a21f954574675020e1d76391b4896211fc7 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <[email protected]>
-Date: Sun, 24 Apr 2022 06:29:44 +0300
-Subject: [PATCH] Enable -fstack-protector-strong by default
-
----
- clang/lib/Driver/ToolChains/Linux.h | 5 +++++
- clang/test/Driver/fsanitize.c | 6 +++---
- clang/test/Driver/stack-protector.c | 4 ++--
- 3 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/clang/lib/Driver/ToolChains/Linux.h
b/clang/lib/Driver/ToolChains/Linux.h
-index a5648d79d655..3c4546cb9204 100644
---- a/clang/lib/Driver/ToolChains/Linux.h
-+++ b/clang/lib/Driver/ToolChains/Linux.h
-@@ -10,6 +10,7 @@
- #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_LINUX_H
-
- #include "Gnu.h"
-+#include "clang/Basic/LangOptions.h"
- #include "clang/Driver/ToolChain.h"
-
- namespace clang {
-@@ -46,6 +47,10 @@ public:
- IsAArch64OutlineAtomicsDefault(const llvm::opt::ArgList &Args) const
override;
- bool isPIEDefault(const llvm::opt::ArgList &Args) const override;
- bool IsMathErrnoDefault() const override;
-+ LangOptions::StackProtectorMode
-+ GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
-+ return LangOptions::SSPStrong;
-+ }
- SanitizerMask getSupportedSanitizers() const override;
- void addProfileRTLibs(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs) const override;
-diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
-index 17fce1981eea..a732d29b7688 100644
---- a/clang/test/Driver/fsanitize.c
-+++ b/clang/test/Driver/fsanitize.c
-@@ -666,12 +666,12 @@
- // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s
-check-prefix=NOSP
- // NOSP-NOT: "-fsanitize=safe-stack"
-
--// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 |
FileCheck %s -check-prefix=NO-SP
-+// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 |
FileCheck %s -check-prefix=SP
- // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=SP-ASAN
- // RUN: %clang -target x86_64-linux-gnu -fstack-protector
-fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
- // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack
-fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
--// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=NO-SP
--// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=NO-SP
-+// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=SP
-+// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=SP
- // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=NO-SP
- // NO-SP-NOT: stack-protector
- // NO-SP: "-fsanitize=safe-stack"
-diff --git a/clang/test/Driver/stack-protector.c
b/clang/test/Driver/stack-protector.c
-index a3e40b50eed8..dfffe0d6cf85 100644
---- a/clang/test/Driver/stack-protector.c
-+++ b/clang/test/Driver/stack-protector.c
-@@ -3,11 +3,11 @@
- // NOSSP-NOT: "-stack-protector-buffer-size"
-
- // RUN: %clang -target i386-unknown-linux -fstack-protector -### %s 2>&1 |
FileCheck %s -check-prefix=SSP
--// SSP: "-stack-protector" "1"
-+// SSP: "-stack-protector" "2"
- // SSP-NOT: "-stack-protector-buffer-size"
-
- // RUN: %clang -target i386-unknown-linux -fstack-protector --param
ssp-buffer-size=16 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-BUF
--// SSP-BUF: "-stack-protector" "1"
-+// SSP-BUF: "-stack-protector" "2"
- // SSP-BUF: "-stack-protector-buffer-size" "16"
-
- // RUN: %clang -target i386-pc-openbsd -### %s 2>&1 | FileCheck %s
-check-prefix=OPENBSD
Copied:
clang/repos/extra-x86_64/enable-fstack-protector-strong-by-default.patch (from
rev 456994, clang/trunk/enable-fstack-protector-strong-by-default.patch)
===================================================================
--- enable-fstack-protector-strong-by-default.patch
(rev 0)
+++ enable-fstack-protector-strong-by-default.patch 2022-09-29 19:22:36 UTC
(rev 456995)
@@ -0,0 +1,72 @@
+From 75c02a21f954574675020e1d76391b4896211fc7 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <[email protected]>
+Date: Sun, 24 Apr 2022 06:29:44 +0300
+Subject: [PATCH] Enable -fstack-protector-strong by default
+
+---
+ clang/lib/Driver/ToolChains/Linux.h | 5 +++++
+ clang/test/Driver/fsanitize.c | 6 +++---
+ clang/test/Driver/stack-protector.c | 4 ++--
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Linux.h
b/clang/lib/Driver/ToolChains/Linux.h
+index a5648d79d655..3c4546cb9204 100644
+--- a/clang/lib/Driver/ToolChains/Linux.h
++++ b/clang/lib/Driver/ToolChains/Linux.h
+@@ -10,6 +10,7 @@
+ #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_LINUX_H
+
+ #include "Gnu.h"
++#include "clang/Basic/LangOptions.h"
+ #include "clang/Driver/ToolChain.h"
+
+ namespace clang {
+@@ -46,6 +47,10 @@ public:
+ IsAArch64OutlineAtomicsDefault(const llvm::opt::ArgList &Args) const
override;
+ bool isPIEDefault(const llvm::opt::ArgList &Args) const override;
+ bool IsMathErrnoDefault() const override;
++ LangOptions::StackProtectorMode
++ GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++ return LangOptions::SSPStrong;
++ }
+ SanitizerMask getSupportedSanitizers() const override;
+ void addProfileRTLibs(const llvm::opt::ArgList &Args,
+ llvm::opt::ArgStringList &CmdArgs) const override;
+diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
+index 17fce1981eea..a732d29b7688 100644
+--- a/clang/test/Driver/fsanitize.c
++++ b/clang/test/Driver/fsanitize.c
+@@ -666,12 +666,12 @@
+ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s
-check-prefix=NOSP
+ // NOSP-NOT: "-fsanitize=safe-stack"
+
+-// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 |
FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 |
FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=SP-ASAN
+ // RUN: %clang -target x86_64-linux-gnu -fstack-protector
-fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack
-fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
+-// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=NO-SP
+-// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=SP
++// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s
2>&1 | FileCheck %s -check-prefix=NO-SP
+ // NO-SP-NOT: stack-protector
+ // NO-SP: "-fsanitize=safe-stack"
+diff --git a/clang/test/Driver/stack-protector.c
b/clang/test/Driver/stack-protector.c
+index a3e40b50eed8..dfffe0d6cf85 100644
+--- a/clang/test/Driver/stack-protector.c
++++ b/clang/test/Driver/stack-protector.c
+@@ -3,11 +3,11 @@
+ // NOSSP-NOT: "-stack-protector-buffer-size"
+
+ // RUN: %clang -target i386-unknown-linux -fstack-protector -### %s 2>&1 |
FileCheck %s -check-prefix=SSP
+-// SSP: "-stack-protector" "1"
++// SSP: "-stack-protector" "2"
+ // SSP-NOT: "-stack-protector-buffer-size"
+
+ // RUN: %clang -target i386-unknown-linux -fstack-protector --param
ssp-buffer-size=16 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-BUF
+-// SSP-BUF: "-stack-protector" "1"
++// SSP-BUF: "-stack-protector" "2"
+ // SSP-BUF: "-stack-protector-buffer-size" "16"
+
+ // RUN: %clang -target i386-pc-openbsd -### %s 2>&1 | FileCheck %s
-check-prefix=OPENBSD
