From 9fdff8d700a01b66151d3de13e97abc4d6628995 Mon Sep 17 00:00:00 2001 From: Jinsong Ji Date: Fri, 10 May 2024 07:42:50 -0700 Subject: [PATCH 1/2] [NFC][SYCL] Relax the check in layout_exception In different version of glibc , we may get `struct` instead of `class`. To avoid noisy failures, we can remove the keyword check here. --- sycl/test/abi/layout_exception.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test/abi/layout_exception.cpp b/sycl/test/abi/layout_exception.cpp index 900a8dfe63ab0..e01a5efeed29b 100644 --- a/sycl/test/abi/layout_exception.cpp +++ b/sycl/test/abi/layout_exception.cpp @@ -29,7 +29,7 @@ void foo() { // CHECK-NEXT: 32 | element_type * _M_ptr // CHECK-NEXT: 40 | class std::__shared_count<> _M_refcount // CHECK-NEXT: 40 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi -// CHECK-NEXT: 48 | class std::error_code MErrC +// CHECK-NEXT: std::error_code MErrC // CHECK-NEXT: 48 | int _M_value // CHECK-NEXT: 56 | const error_category * _M_cat // CHECK-NEXT: 0 | class std::exception (primary virtual base) From c3a7aadb70fa9da0aa3350291ecb92b750b40123 Mon Sep 17 00:00:00 2001 From: Jinsong Ji Date: Mon, 13 May 2024 09:19:36 -0700 Subject: [PATCH 2/2] update test --- sycl/test/abi/layout_exception.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test/abi/layout_exception.cpp b/sycl/test/abi/layout_exception.cpp index e01a5efeed29b..2df0238404a55 100644 --- a/sycl/test/abi/layout_exception.cpp +++ b/sycl/test/abi/layout_exception.cpp @@ -29,7 +29,7 @@ void foo() { // CHECK-NEXT: 32 | element_type * _M_ptr // CHECK-NEXT: 40 | class std::__shared_count<> _M_refcount // CHECK-NEXT: 40 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi -// CHECK-NEXT: std::error_code MErrC +// CHECK-NEXT: 48 | {{class|struct}} std::error_code MErrC // CHECK-NEXT: 48 | int _M_value // CHECK-NEXT: 56 | const error_category * _M_cat // CHECK-NEXT: 0 | class std::exception (primary virtual base)