From a371a135ffbfe86a22a0187808f7516a7558bce3 Mon Sep 17 00:00:00 2001
From: "Zhao, Maosu" <maosu.zhao@intel.com>
Date: Wed, 12 Aug 2026 08:09:26 +0200
Subject: [PATCH] [SYCL][Driver] Match sanitizer metadata globals by prefix in
 .tgtsym filter

Commit 0941896bca24 ("[DeviceSanitizer] Make sanitizer metadata globals
per-module unique") appended a per-module unique id to those names
(__AsanKernelMetadata_<id>), so none of the six comparisons matched
anymore and all of the metadata globals leaked into .tgtsym.
Extract the check into isSpecialBitcodeSymbol() and match the sanitizer
globals by prefix.
---
 clang/lib/Driver/OffloadBundler.cpp           | 25 +++++++++++++------
 ...clang-offload-bundler-skip-for-symtbl.c.ll | 15 +++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/clang/lib/Driver/OffloadBundler.cpp b/clang/lib/Driver/OffloadBundler.cpp
index f51707bd88b0a..9110a9dc763c9 100644
--- a/clang/lib/Driver/OffloadBundler.cpp
+++ b/clang/lib/Driver/OffloadBundler.cpp
@@ -82,6 +82,23 @@ using namespace clang;
 
 #define DEBUG_TYPE "clang-offload-bundler"
 
+/// Return true if \p Name is a special bitcode symbol that must not be listed
+/// in the target symbol table. Device sanitizer metadata globals carry a
+/// per-module unique id suffix (e.g. "__AsanKernelMetadata_<id>"), so they are
+/// matched by prefix.
+static bool isSpecialBitcodeSymbol(StringRef Name) {
+  if (Name == "llvm.used" || Name == "llvm.compiler.used")
+    return true;
+
+  static constexpr StringRef SanitizerMetadataPrefixes[] = {
+      "__AsanDeviceGlobalMetadata", "__MsanDeviceGlobalMetadata",
+      "__TsanDeviceGlobalMetadata", "__AsanKernelMetadata",
+      "__MsanKernelMetadata",       "__TsanKernelMetadata"};
+  return llvm::any_of(SanitizerMetadataPrefixes, [Name](StringRef Prefix) {
+    return Name.starts_with(Prefix);
+  });
+}
+
 OffloadTargetInfo::OffloadTargetInfo(const StringRef Target,
                                      const OffloadBundlerConfig &BC)
     : BundlerConfig(BC) {
@@ -751,13 +768,7 @@ class ObjectFileHandler final : public FileHandler {
 
         // If we are dealing with a bitcode file do not add special globals to
         // the list of defined symbols.
-        if (SF->isIR() &&
-            (Name == "llvm.used" || Name == "llvm.compiler.used" ||
-             Name == "__AsanDeviceGlobalMetadata" ||
-             Name == "__MsanDeviceGlobalMetadata" ||
-             Name == "__TsanDeviceGlobalMetadata" ||
-             Name == "__AsanKernelMetadata" || Name == "__MsanKernelMetadata" ||
-             Name == "__TsanKernelMetadata"))
+        if (SF->isIR() && isSpecialBitcodeSymbol(Name))
           continue;
 
         // Add symbol name with the target prefix to the buffer.
diff --git a/clang/test/Driver/clang-offload-bundler-skip-for-symtbl.c.ll b/clang/test/Driver/clang-offload-bundler-skip-for-symtbl.c.ll
index 45147b4f01fec..bb50bf2b1180f 100644
--- a/clang/test/Driver/clang-offload-bundler-skip-for-symtbl.c.ll
+++ b/clang/test/Driver/clang-offload-bundler-skip-for-symtbl.c.ll
@@ -11,6 +11,21 @@
 @__TsanDeviceGlobalMetadata = global i64 0
 ;CHECK-NOT: __TsanDeviceGlobalMetadata
 
+; The sanitizer metadata globals carry a per-module unique id suffix, so the
+; suffixed names must be skipped as well.
+@__AsanKernelMetadata_0123456789abcdef0123456789abcdef = global i64 0
+;CHECK-NOT: __AsanKernelMetadata_0123456789abcdef0123456789abcdef
+@__MsanKernelMetadata_0123456789abcdef0123456789abcdef = global i64 0
+;CHECK-NOT: __MsanKernelMetadata_0123456789abcdef0123456789abcdef
+@__TsanKernelMetadata_0123456789abcdef0123456789abcdef = global i64 0
+;CHECK-NOT: __TsanKernelMetadata_0123456789abcdef0123456789abcdef
+@__AsanDeviceGlobalMetadata_0123456789abcdef0123456789abcdef = global i64 0
+;CHECK-NOT: __AsanDeviceGlobalMetadata_0123456789abcdef0123456789abcdef
+@__MsanDeviceGlobalMetadata_0123456789abcdef0123456789abcdef = global i64 0
+;CHECK-NOT: __MsanDeviceGlobalMetadata_0123456789abcdef0123456789abcdef
+@__TsanDeviceGlobalMetadata_0123456789abcdef0123456789abcdef = global i64 0
+;CHECK-NOT: __TsanDeviceGlobalMetadata_0123456789abcdef0123456789abcdef
+
 @not_skipping = global i64 0
 ;CHECK: not_skipping