Author: Vitaly Buka Date: 2025-04-17T11:31:31-07:00 New Revision: 206321b47a877e503dc8bfec7037566da61157fc
URL: https://github.com/llvm/llvm-project/commit/206321b47a877e503dc8bfec7037566da61157fc DIFF: https://github.com/llvm/llvm-project/commit/206321b47a877e503dc8bfec7037566da61157fc.diff LOG: Reapply "[NFC][CFI] Avoid clang error in CFI tests" (#136030) (#136177) PR #136030 is expected to work after #136032. This reverts commit 6b0c8c4acd31eba83bf20ab1cf8729b2153e383c. Added: Modified: clang/test/Driver/sanitizer-ld.c Removed: ################################################################################ diff --git a/clang/test/Driver/sanitizer-ld.c b/clang/test/Driver/sanitizer-ld.c index 0ace06bac3b31..4239c52a5fdcc 100644 --- a/clang/test/Driver/sanitizer-ld.c +++ b/clang/test/Driver/sanitizer-ld.c @@ -840,7 +840,8 @@ // CHECK-CFI-PREREQ-LINUX: '-fsanitize=cfi' only allowed with '-fvisibility=' // CFI by itself does not link runtime libraries. -// RUN: not %clang -fsanitize=cfi \ +// RUN: %clang -fsanitize=cfi \ +// RUN: -flto -fvisibility=hidden \ // RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ // RUN: --sysroot=%S/Inputs/basic_linux_tree \ @@ -849,7 +850,8 @@ // CHECK-CFI-LINUX: "{{.*}}ld{{(.exe)?}}" // CFI with diagnostics links the UBSan runtime. -// RUN: not %clang -fsanitize=cfi -fno-sanitize-trap=cfi -fsanitize-recover=cfi \ +// RUN: %clang -fsanitize=cfi -fno-sanitize-trap=cfi -fsanitize-recover=cfi \ +// RUN: -flto -fvisibility=hidden \ // RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ // RUN: --sysroot=%S/Inputs/basic_linux_tree \ @@ -859,7 +861,8 @@ // CHECK-CFI-DIAG-LINUX: "--whole-archive" "{{[^"]*}}libclang_rt.ubsan_standalone.a" "--no-whole-archive" // Cross-DSO CFI links the CFI runtime. -// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ +// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ +// RUN: -flto -fvisibility=hidden \ // RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ // RUN: --sysroot=%S/Inputs/basic_linux_tree \ @@ -870,7 +873,8 @@ // CHECK-CFI-CROSS-DSO-LINUX: -export-dynamic // Cross-DSO CFI with diagnostics links just the CFI runtime. -// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ +// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ +// RUN: -flto -fvisibility=hidden \ // RUN: -fno-sanitize-trap=cfi -fsanitize-recover=cfi \ // RUN: --target=x86_64-unknown-linux -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ @@ -882,7 +886,8 @@ // CHECK-CFI-CROSS-DSO-DIAG-LINUX: -export-dynamic // Cross-DSO CFI on Android does not link runtime libraries. -// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ +// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ +// RUN: -flto -fvisibility=hidden \ // RUN: --target=aarch64-linux-android -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ // RUN: --sysroot=%S/Inputs/basic_android_tree \ @@ -891,7 +896,8 @@ // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}" // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime. -// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ +// RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso \ +// RUN: -flto -fvisibility=hidden \ // RUN: -fno-sanitize-trap=cfi -fsanitize-recover=cfi \ // RUN: --target=aarch64-linux-android -fuse-ld=ld \ // RUN: -resource-dir=%S/Inputs/resource_dir \ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
