Skip to content

Commit 718f1ed

Browse files
committed
Fix test mismatch failure
1 parent 2a9dfda commit 718f1ed

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

clang/test/Modules/cxx-templates.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ namespace Std {
251251

252252
// CHECK-DUMP: ClassTemplateDecl {{.*}} <{{.*[/\\]}}cxx-templates-common.h:1:1, {{.*}}> col:{{.*}} in cxx_templates_common SomeTemplate
253253
// CHECK-DUMP: ClassTemplateSpecializationDecl {{.*}} prev {{.*}} SomeTemplate
254-
// CHECK-DUMP-NEXT: TemplateArgument type 'char[2]'
254+
// CHECK-DUMP-NEXT: TemplateArgument type 'char[1]'
255255
// CHECK-DUMP: ClassTemplateSpecializationDecl {{.*}} SomeTemplate definition
256256
// CHECK-DUMP-NEXT: DefinitionData
257257
// CHECK-DUMP-NEXT: DefaultConstructor
@@ -260,9 +260,9 @@ namespace Std {
260260
// CHECK-DUMP-NEXT: CopyAssignment
261261
// CHECK-DUMP-NEXT: MoveAssignment
262262
// CHECK-DUMP-NEXT: Destructor
263-
// CHECK-DUMP-NEXT: TemplateArgument type 'char[2]'
264-
// CHECK-DUMP: ClassTemplateSpecializationDecl {{.*}} prev {{.*}} SomeTemplate
265263
// CHECK-DUMP-NEXT: TemplateArgument type 'char[1]'
264+
// CHECK-DUMP: ClassTemplateSpecializationDecl {{.*}} prev {{.*}} SomeTemplate
265+
// CHECK-DUMP-NEXT: TemplateArgument type 'char[2]'
266266
// CHECK-DUMP: ClassTemplateSpecializationDecl {{.*}} SomeTemplate definition
267267
// CHECK-DUMP-NEXT: DefinitionData
268268
// CHECK-DUMP-NEXT: DefaultConstructor
@@ -271,4 +271,5 @@ namespace Std {
271271
// CHECK-DUMP-NEXT: CopyAssignment
272272
// CHECK-DUMP-NEXT: MoveAssignment
273273
// CHECK-DUMP-NEXT: Destructor
274-
// CHECK-DUMP-NEXT: TemplateArgument type 'char[1]'
274+
// CHECK-DUMP-NEXT: TemplateArgument type 'char[2]'
275+

clang/test/Modules/odr_hash.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3084,8 +3084,8 @@ struct S5 {
30843084
};
30853085
#else
30863086
S5 s5;
3087-
// expected-error@second.h:* {{'PointersAndReferences::S5::x' from module 'SecondModule' is not present in definition of 'PointersAndReferences::S5' in module 'FirstModule'}}
3088-
// expected-note@first.h:* {{declaration of 'x' does not match}}
3087+
// expected-error@first.h:* {{'PointersAndReferences::S5::x' from module 'FirstModule' is not present in definition of 'PointersAndReferences::S5' in module 'SecondModule'}}
3088+
// expected-note@second.h:* {{declaration of 'x' does not match}}
30893089
#endif
30903090

30913091
#if defined(FIRST)

0 commit comments

Comments
 (0)