Skip to content

Commit d079955

Browse files
tahonermannjsji
authored andcommitted
[NFC] Fix downstream test failures due to new "dead_on_return" annotations and AST type sugaring. (#31466)
Following commit 9e0c06d (Set dead_on_return when passing arguments indirectly), the "dead_on_return" annotation is now set on indirectly passed arguments. Following commit 7c402b8 (Reland [Clang] Make the SizeType, SignedSizeType and PtrdiffType be named sugar types), the use of some type aliases is more often preserved in AST dumps.
1 parent ce1060b commit d079955

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

clang/test/CodeGenSYCL/nontrivial_device_copyable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ int main() {
2929

3030
// CHECK: define {{.*}}spir_kernel void @{{.*}}kernel_name(ptr noundef byval(%struct.NontriviallyCopyable)
3131
// CHECK-NOT: define {{.*}}spir_func void @{{.*}}device_func{{.*}}({{.*}}byval(%struct.NontriviallyCopyable)
32-
// CHECK: define {{.*}}spir_func void @_Z11device_func20NontriviallyCopyable(ptr noundef %X)
32+
// CHECK: define {{.*}}spir_func void @_Z11device_func20NontriviallyCopyable(ptr dead_on_return noundef %X)
3333
// CHECK: %X.indirect_addr = alloca ptr addrspace(4)
3434
// CHECK: %X.indirect_addr.ascast = addrspacecast ptr %X.indirect_addr to ptr addrspace(4)
3535
// CHECK: %X.ascast = addrspacecast ptr %X to ptr addrspace(4)

clang/test/CodeGenSYCL/regcall-cc-test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ struct NonCopyable {
333333
// CHECK-DAG: %struct.NonCopyable = type { i32 }
334334

335335
SYCL_DEVICE int __regcall bar(NonCopyable x) {
336-
// CHECK-DAG: define dso_local x86_regcallcc noundef i32 @_Z15__regcall3__bar11NonCopyable(ptr noundef %x)
336+
// CHECK-DAG: define dso_local x86_regcallcc noundef i32 @_Z15__regcall3__bar11NonCopyable(ptr dead_on_return noundef %x)
337337
return x.a;
338338
}
339339

clang/test/SemaSYCL/array-kernel-param.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ int main() {
232232
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int[2][3]' lvalue
233233
// CHECK-NEXT: MemberExpr {{.*}} 'int[2][3]' lvalue .
234234
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_array_2D' '__wrapper_class'
235-
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned
235+
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} '__size_t'
236236
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
237237
// CHECK-NEXT: ArraySubscriptExpr {{.*}} 'int' lvalue
238238
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <ArrayToPointerDecay>
@@ -242,8 +242,8 @@ int main() {
242242
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'int[2][3]' lvalue
243243
// CHECK-NEXT: MemberExpr {{.*}} 'int[2][3]' lvalue .
244244
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_array_2D' '__wrapper_class'
245-
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned
246-
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned
245+
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} '__size_t'
246+
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} '__size_t'
247247

248248
// Check Kernel_NonDecomposedStruct parameters.
249249
// CHECK: FunctionDecl {{.*}}Kernel_NonDecomposedStruct{{.*}} 'void (__wrapper_class) __attribute__((device_kernel))'
@@ -264,7 +264,7 @@ int main() {
264264
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'NonDecomposedStruct[2]' lvalue
265265
// CHECK-NEXT: MemberExpr {{.*}} 'NonDecomposedStruct[2]' lvalue .
266266
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_NonDecompStructArray' '__wrapper_class'
267-
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} 'unsigned
267+
// CHECK-NEXT: ArrayInitIndexExpr {{.*}} '__size_t'
268268

269269
// Check Kernel_StructWithPointers parameters.
270270
// CHECK: FunctionDecl {{.*}}Kernel_StructWithPointers{{.*}} 'void (__wrapper_class) __attribute__((device_kernel))'

sycl/test/check_device_code/esimd/vec_arg_call_conv_ext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ SYCL_EXTERNAL void callee_void__noopt_opt(simd<int, 8>& x, simd<int, 8> y) SYCL_
6262

6363
__attribute__((noinline))
6464
SYCL_EXTERNAL simd<int, 8> test__sret__noopt_opt(simd<int, 8> x) SYCL_ESIMD_FUNCTION {
65-
// CHECK: define dso_local spir_func <8 x i32> @_Z21test__sret__noopt_opt{{.*}}(ptr noundef %{{.*}})
65+
// CHECK: define dso_local spir_func <8 x i32> @_Z21test__sret__noopt_opt{{.*}}(ptr dead_on_return noundef %{{.*}})
6666
callee_void__noopt_opt(x, x);
6767
// CHECK: call spir_func void @_Z22callee_void__noopt_opt{{.*}}(ptr addrspace(4) %{{.*}}, <8 x i32> %{{.*}})
6868
return x;

0 commit comments

Comments
 (0)