Revert "[Offload] Fix assumptions on symbols after #124846 (#126238)"
This reverts commit 191d7d64e5bc9c66fcb17a4c752a55129d33fd44.
diff --git a/offload/test/sanitizer/kernel_crash_many.c b/offload/test/sanitizer/kernel_crash_many.c
index 9fd8af4..f1d17ca 100644
--- a/offload/test/sanitizer/kernel_crash_many.c
+++ b/offload/test/sanitizer/kernel_crash_many.c
@@ -37,36 +37,36 @@
// CHECK: Kernel 1: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c
+// DEBUG: main {{.*}}kernel_crash_many.c:
//
// CHECK: Kernel 2: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c
+// DEBUG: main {{.*}}kernel_crash_many.c:
//
// CHECK: Kernel 3: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c
+// DEBUG: main {{.*}}kernel_crash_many.c:
//
// CHECK: Kernel 4: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c
+// DEBUG: main {{.*}}kernel_crash_many.c:
//
// CHECK: Kernel 5: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c
+// DEBUG: main {{.*}}kernel_crash_many.c:
//
// CHECK: Kernel 6: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c
+// DEBUG: main {{.*}}kernel_crash_many.c:
//
// CHECK: Kernel 7: {{.*}} (__omp_offloading_{{.*}}_main_l22)
// CHECK: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_crash_many.c
+// DEBUG: main {{.*}}kernel_crash_many.c:
//
// CHECK-NOT: Kernel {{[[0-9]]+}}:
diff --git a/offload/test/sanitizer/kernel_trap.c b/offload/test/sanitizer/kernel_trap.c
index 3a531bd..d1742db 100644
--- a/offload/test/sanitizer/kernel_trap.c
+++ b/offload/test/sanitizer/kernel_trap.c
@@ -39,4 +39,5 @@
// CHECK: OFFLOAD ERROR: Kernel 'omp target in main @ 30 (__omp_offloading_{{.*}}_main_l30)'
// CHECK: OFFLOAD ERROR: execution interrupted by hardware trap instruction
// TRACE: launchKernel
+// CHECK: main
// clang-format on
diff --git a/offload/test/sanitizer/kernel_trap.cpp b/offload/test/sanitizer/kernel_trap.cpp
index 44858be..c67b385 100644
--- a/offload/test/sanitizer/kernel_trap.cpp
+++ b/offload/test/sanitizer/kernel_trap.cpp
@@ -47,6 +47,6 @@
// TRACE: launchKernel
// NDEBG: cxx_function_name<S>(int, S*)
// NDEBG: main
-// DEBUG: cxx_function_name<S>(int, S*) {{.*}}kernel_trap.cpp
-// DEBUG: main {{.*}}kernel_trap.cpp
+// DEBUG: cxx_function_name<S>(int, S*) {{.*}}kernel_trap.cpp:
+// DEBUG: main {{.*}}kernel_trap.cpp:
// clang-format on
diff --git a/offload/test/sanitizer/kernel_trap_many.c b/offload/test/sanitizer/kernel_trap_many.c
index 061c0fe..f2e6379 100644
--- a/offload/test/sanitizer/kernel_trap_many.c
+++ b/offload/test/sanitizer/kernel_trap_many.c
@@ -32,4 +32,4 @@
// TRACE: OFFLOAD ERROR: execution interrupted by hardware trap instruction
// TRACE: launchKernel
// NDEBG: main
-// DEBUG: main {{.*}}kernel_trap_many.c
+// DEBUG: main {{.*}}kernel_trap_many.c: