Skip to content

Commit e2409fe

Browse files
authored
[DeviceSAN] Fix asan and msan lit tests crashed on CPU (#18525)
fix: #18516 CMPLRLLVM-67822
1 parent 6a4665e commit e2409fe

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

libdevice/sanitizer/asan_rtl.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,8 @@ static __SYCL_CONSTANT__ const char __asan_print_private_base[] =
905905
DEVICE_EXTERN_C_NOINLINE void
906906
__asan_set_private_base(__SYCL_PRIVATE__ void *ptr) {
907907
auto launch_info = (__SYCL_GLOBAL__ const AsanRuntimeData *)__AsanLaunchInfo;
908-
if (!launch_info || launch_info->PrivateShadowOffset == 0)
908+
if (!launch_info || launch_info->PrivateShadowOffset == 0 ||
909+
launch_info->PrivateBase == 0)
909910
return;
910911
// Only set on the first sub-group item
911912
if (__spirv_BuiltInSubgroupLocalInvocationId != 0)

libdevice/sanitizer/msan_rtl.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,8 @@ static __SYCL_CONSTANT__ const char __msan_print_private_base[] =
578578

579579
DEVICE_EXTERN_C_NOINLINE void
580580
__msan_set_private_base(__SYCL_PRIVATE__ void *ptr) {
581-
if (!GetMsanLaunchInfo || GetMsanLaunchInfo->PrivateShadowOffset == 0)
581+
if (!GetMsanLaunchInfo || GetMsanLaunchInfo->PrivateShadowOffset == 0 ||
582+
GetMsanLaunchInfo->PrivateBase == 0)
582583
return;
583584
// Only set on the first sub-group item
584585
if (__spirv_BuiltInSubgroupLocalInvocationId != 0)

0 commit comments

Comments
 (0)