Skip to content

[sycl-rel] Cherry-pick sanitizer patches #18885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 18, 2025
Merged

[sycl-rel] Cherry-pick sanitizer patches #18885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdf345b
[compiler-rt][builtins] Add missing flag for builtins standalone buil…
yingcong-wu Mar 27, 2025
e9fd4e7
[DeviceSanitizer][Coverity] die when fail to create context (#17600)
yingcong-wu Mar 27, 2025
aa53e1f
[DeviceSanitizer] Skip adding device sanitizers internal variable to …
yingcong-wu Mar 24, 2025
5bc808f
Revert "[compiler-rt][builtins] Add missing flag for builtins standal…
KornevNikita Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion clang/lib/Driver/OffloadBundler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,10 @@ class ObjectFileHandler final : public FileHandler {
if (SF->isIR() &&
(Name == "llvm.used" || Name == "llvm.compiler.used" ||
Name == "__AsanDeviceGlobalMetadata" ||
Name == "__AsanKernelMetadata" || Name == "__MsanKernelMetadata"))
Name == "__MsanDeviceGlobalMetadata" ||
Name == "__TsanDeviceGlobalMetadata" ||
Name == "__AsanKernelMetadata" || Name == "__MsanKernelMetadata" ||
Name == "__TsanKernelMetadata"))
continue;

// Add symbol name with the target prefix to the buffer.
Expand Down
6 changes: 6 additions & 0 deletions clang/test/Driver/clang-offload-bundler-skip-for-symtbl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// RUN: llvm-as %s.ll -o %t-in.bc
// RUN: %clang -c -o %t-in.o %s
// RUN: clang-offload-bundler -type=o -targets=openmp-spir64_gen,host-x86_64-unknown-linux-gnu -input=%t-in.bc -input=%t-in.o -output=%t-out.o
// RUN: llvm-readobj --string-dump=.tgtsym %t-out.o | FileCheck %s.ll

int main() {return 0;}
18 changes: 18 additions & 0 deletions clang/test/Driver/clang-offload-bundler-skip-for-symtbl.c.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@__AsanKernelMetadata = global i64 0
;CHECK-NOT: __AsanKernelMetadata
@__MsanKernelMetadata = global i64 0
;CHECK-NOT: __MsanKernelMetadata
@__TsanKernelMetadata = global i64 0
;CHECK-NOT: __TsanKernelMetadata
@__AsanDeviceGlobalMetadata = global i64 0
;CHECK-NOT: __AsanDeviceGlobalMetadata
@__MsanDeviceGlobalMetadata = global i64 0
;CHECK-NOT: __MsanDeviceGlobalMetadata
@__TsanDeviceGlobalMetadata = global i64 0
;CHECK-NOT: __TsanDeviceGlobalMetadata

@not_skipping = global i64 0
;CHECK: not_skipping

@__another_global = global i64 0
;CHECK: __another_global
8 changes: 7 additions & 1 deletion unified-runtime/source/loader/layers/sanitizer/ur_sanitizer_layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@
#include "msan/msan_ddi.hpp"

namespace ur_sanitizer_layer {
context_t *getContext() { return context_t::get_direct(); }
context_t *getContext() {
try {
return context_t::get_direct();
} catch (...) {
die("Failed to get sanitizer context.");
}
}

///////////////////////////////////////////////////////////////////////////////
context_t::context_t()
Expand Down
Loading