Skip to content

Commit 8bf71d7

Browse files
Michael137Michael137
committed
fixup! fix more tests
1 parent 65f11ed commit 8bf71d7

File tree

12 files changed

+21
-21
lines changed

12 files changed

+21
-21
lines changed

‎clang/test/ASTMerge/struct/test.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
// CHECK: struct2.c:72:7: note: field 'i' has type 'int' here
4545
// CHECK: struct2.c:76:5: warning: external variable 'x13' declared with incompatible types in different translation units ('S13' vs. 'S13')
4646
// CHECK: struct1.c:79:5: note: declared here with type 'S13'
47-
// CHECK: struct1.c:130:7: warning: type 'struct DeepUnnamedError::(anonymous union)::(anonymous union)::(unnamed at [[PATH_TO_INPUTS:.+]]struct1.c:130:7)' has incompatible definitions in different translation units
47+
// CHECK: struct1.c:130:7: warning: type 'struct DeepUnnamedError::(unnamed union)::(unnamed union)::(unnamed at [[PATH_TO_INPUTS:.+]]struct1.c:130:7)' has incompatible definitions in different translation units
4848
// CHECK: struct1.c:131:14: note: field 'i' has type 'long' here
4949
// CHECK: struct2.c:128:15: note: field 'i' has type 'float' here
50-
// CHECK: struct1.c:129:5: warning: type 'union DeepUnnamedError::(anonymous union)::(unnamed at [[PATH_TO_INPUTS]]struct1.c:129:5)' has incompatible definitions in different translation units
50+
// CHECK: struct1.c:129:5: warning: type 'union DeepUnnamedError::(unnamed union)::(unnamed at [[PATH_TO_INPUTS]]struct1.c:129:5)' has incompatible definitions in different translation units
5151
// CHECK: struct1.c:132:9: note: field 'S' has type 'struct (unnamed struct at [[PATH_TO_INPUTS]]struct1.c:130:7)' here
5252
// CHECK: struct2.c:129:9: note: field 'S' has type 'struct (unnamed struct at [[PATH_TO_INPUTS]]struct2.c:127:7)' here
5353
// CHECK: struct2.c:138:3: warning: external variable 'x16' declared with incompatible types in different translation units ('struct DeepUnnamedError' vs. 'struct DeepUnnamedError')

‎clang/test/Analysis/Inputs/expected-plists/lambda-notes.cpp.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
<key>type</key><string>Division by zero</string>
175175
<key>check_name</key><string>core.DivideZero</string>
176176
<!-- This hash is experimental and going to change! -->
177-
<key>issue_hash_content_of_line_in_context</key><string>bd4eed3234018edced5efc2ed5562a74</string>
177+
<key>issue_hash_content_of_line_in_context</key><string>d3cd158ad0fd8ce44df89c6779a1faec</string>
178178
<key>issue_context_kind</key><string>C++ method</string>
179179
<key>issue_context</key><string>operator()</string>
180180
<key>issue_hash_function_offset</key><string>1</string>

‎clang/test/Analysis/analyzer-note-analysis-entry-points.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ void checkASTCodeBodyHasAnalysisEntryPoints() {
5151
}
5252

5353
void notInvokedLambdaScope() {
54-
// CHECK: note: [debug] analyzing from notInvokedLambdaScope()::(anonymous class)::operator()()
54+
// CHECK: note: [debug] analyzing from notInvokedLambdaScope()::(lambda)::operator()()
5555
// CHECK-NEXT: | auto notInvokedLambda = []() {
5656
// CHECK-NEXT: | ^
57-
// textout-note@+1 {{[debug] analyzing from notInvokedLambdaScope()::(anonymous class)::operator()()}}
57+
// textout-note@+1 {{[debug] analyzing from notInvokedLambdaScope()::(lambda)::operator()()}}
5858
auto notInvokedLambda = []() {
5959
// common-warning@+1 {{REACHABLE}} textout-note@+1 {{REACHABLE}}
6060
clang_analyzer_warnIfReached();
@@ -72,4 +72,4 @@ void invokedLambdaScope() {
7272
clang_analyzer_warnIfReached();
7373
};
7474
invokedLambda(); // textout-note {{Calling 'operator()'}}
75-
}
75+
}

‎clang/test/Analysis/bug_hash_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void AA::X::OutOfLine() {
6565

6666
void testLambda() {
6767
[]() {
68-
clang_analyzer_hashDump(5); // expected-warning {{debug.ExprInspection$void testLambda()::(anonymous class)::operator()() const$29$clang_analyzer_hashDump(5);$Category}}
68+
clang_analyzer_hashDump(5); // expected-warning {{debug.ExprInspection$void testLambda()::(lambda)::operator()() const$29$clang_analyzer_hashDump(5);$Category}}
6969
}();
7070
}
7171

‎clang/test/Analysis/debug-CallGraph.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ namespace CallDecl {
9797
}
9898

9999
// CHECK:--- Call graph Dump ---
100-
// CHECK-NEXT: {{Function: < root > calls: get5 add test_add mmm foo aaa < > bbb ddd ccc eee fff do_nothing test_single_call SomeNS::templ SomeNS::templ SomeNS::templUser Lambdas::Callee Lambdas::f1 Lambdas::f1\(\)::\(anonymous class\)::operator\(\) Lambdas::f1\(\)::\(anonymous class\)::operator\(\) CallDecl::SomeDef CallDecl::Caller CallDecl::SomeDecl CallDecl::SomeOtherDecl $}}
100+
// CHECK-NEXT: {{Function: < root > calls: get5 add test_add mmm foo aaa < > bbb ddd ccc eee fff do_nothing test_single_call SomeNS::templ SomeNS::templ SomeNS::templUser Lambdas::Callee Lambdas::f1 Lambdas::f1\(\)::\(lambda\)::operator\(\) Lambdas::f1\(\)::\(lambda\)::operator\(\) CallDecl::SomeDef CallDecl::Caller CallDecl::SomeDecl CallDecl::SomeOtherDecl $}}
101101
// CHECK-NEXT: {{Function: CallDecl::Caller calls: CallDecl::SomeDecl CallDecl::SomeOtherDecl $}}
102102
// CHECK-NEXT: {{Function: CallDecl::SomeOtherDecl calls: CallDecl::SomeDef $}}
103103
// CHECK-NEXT: {{Function: CallDecl::SomeDecl calls: $}}
104104
// CHECK-NEXT: {{Function: CallDecl::SomeDef calls: $}}
105-
// CHECK-NEXT: {{Function: Lambdas::f1 calls: Lambdas::f1\(\)::\(anonymous class\)::operator\(\) Lambdas::f1\(\)::\(anonymous class\)::operator\(\) $}}
106-
// CHECK-NEXT: {{Function: Lambdas::f1\(\)::\(anonymous class\)::operator\(\) calls: Lambdas::Callee $}}
107-
// CHECK-NEXT: {{Function: Lambdas::f1\(\)::\(anonymous class\)::operator\(\) calls: Lambdas::Callee $}}
105+
// CHECK-NEXT: {{Function: Lambdas::f1 calls: Lambdas::f1\(\)::\(lambda\)::operator\(\) Lambdas::f1\(\)::\(lambda\)::operator\(\) $}}
106+
// CHECK-NEXT: {{Function: Lambdas::f1\(\)::\(lambda\)::operator\(\) calls: Lambdas::Callee $}}
107+
// CHECK-NEXT: {{Function: Lambdas::f1\(\)::\(lambda\)::operator\(\) calls: Lambdas::Callee $}}
108108
// CHECK-NEXT: {{Function: Lambdas::Callee calls: $}}
109109
// CHECK-NEXT: {{Function: SomeNS::templUser calls: SomeNS::templ SomeNS::templ $}}
110110
// CHECK-NEXT: {{Function: SomeNS::templ calls: eee $}}

‎clang/test/Analysis/inlining/Inputs/expected-plists/path-notes.cpp.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@
722722
<key>type</key><string>Dereference of null pointer</string>
723723
<key>check_name</key><string>core.NullDereference</string>
724724
<!-- This hash is experimental and going to change! -->
725-
<key>issue_hash_content_of_line_in_context</key><string>efde323086a985fe1e8ccc6cd0123c12</string>
725+
<key>issue_hash_content_of_line_in_context</key><string>c13b0c1fd27df0a9d9c0b4c125ade016</string>
726726
<key>issue_context_kind</key><string>C++ method</string>
727727
<key>issue_context</key><string>method</string>
728728
<key>issue_hash_function_offset</key><string>1</string>

‎clang/test/CodeGenCXX/predefined-expr.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// CHECK-DAG: private unnamed_addr constant [103 x i8] c"static void ClassWithTemplateTemplateParam<char>::staticMember() [T = char, Param = NS::ClassTemplate]\00"
1111
// CHECK-DAG: private unnamed_addr constant [106 x i8] c"void OuterClass<int *>::MiddleClass::InnerClass<float>::memberFunction(T, U) const [T = int *, U = float]\00"
1212
// CHECK-DAG: private unnamed_addr constant [51 x i8] c"void functionTemplateWithCapturedStmt(T) [T = int]\00"
13-
// CHECK-DAG: private unnamed_addr constant [76 x i8] c"auto functionTemplateWithLambda(int)::(anonymous class)::operator()() const\00"
13+
// CHECK-DAG: private unnamed_addr constant [76 x i8] c"auto functionTemplateWithLambda(int)::(lambda)::operator()() const\00"
1414
// CHECK-DAG: private unnamed_addr constant [65 x i8] c"void functionTemplateWithUnnamedTemplateParameter(T) [T = float]\00"
1515

1616
// CHECK-DAG: private unnamed_addr constant [60 x i8] c"void functionTemplateExplicitSpecialization(T) [T = double]\00"

‎clang/test/Index/print-type.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ _Atomic(unsigned long) aul;
7171
// CHECK: TypeRef=struct Struct:16:8 [type=struct Struct] [typekind=Record] [isPOD=1]
7272
// CHECK: StructDecl=struct (unnamed at {{.*}}):18:1 (Definition) [type=struct (unnamed at {{.*}}print-type.c:18:1)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=0]
7373
// CHECK: StructDecl=struct (unnamed at {{.*}}):23:1 (Definition) [type=struct (unnamed at {{.*}}print-type.c:23:1)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1] [isAnonRecDecl=0]
74-
// CHECK: StructDecl=struct (anonymous at {{.*}}):24:3 (Definition) [type=struct (anonymous struct)::(anonymous at {{.*}}print-type.c:24:3)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=1]
74+
// CHECK: StructDecl=struct (anonymous at {{.*}}):24:3 (Definition) [type=struct (unnamed struct)::(anonymous at {{.*}}print-type.c:24:3)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=1]
7575
// CHECK: FieldDecl=x:25:17 (Definition) [type=_Atomic(int)] [typekind=Atomic] [valuetype=int] [valuetypekind=Int] [isPOD=0] [isAnonRecDecl=0]
7676
// CHECK: FieldDecl=y:26:9 (Definition) [type=int] [typekind=Int] [isPOD=1] [isAnonRecDecl=0]
7777
// CHECK: StructDecl=struct (unnamed at {{.*}}):30:10 (Definition) [type=struct (unnamed at {{.*}}print-type.c:30:10)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=0]

‎clang/test/Layout/ms-x86-alias-avoidance-padding.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct AT3 : AT2, AT1 {
4949
// CHECK-NEXT: 0 | struct AT2 (base)
5050
// CHECK-NEXT: 0 | struct AT0 t
5151
// CHECK-NEXT: 0 | union AT0::(unnamed at {{.*}} x
52-
// CHECK-NEXT: 0 | struct AT0::(anonymous union)::(unnamed at {{.*}} y
52+
// CHECK-NEXT: 0 | struct AT0::(unnamed union)::(unnamed at {{.*}} y
5353
// CHECK-NEXT: 0 | int a
5454
// CHECK-NEXT: 4 | struct AT t (empty)
5555
// CHECK: 0 | int b
@@ -66,7 +66,7 @@ struct AT3 : AT2, AT1 {
6666
// CHECK-X64-NEXT: 0 | struct AT2 (base)
6767
// CHECK-X64-NEXT: 0 | struct AT0 t
6868
// CHECK-X64-NEXT: 0 | union AT0::(unnamed at {{.*}} x
69-
// CHECK-X64-NEXT: 0 | struct AT0::(anonymous union)::(unnamed at {{.*}} y
69+
// CHECK-X64-NEXT: 0 | struct AT0::(unnamed union)::(unnamed at {{.*}} y
7070
// CHECK-X64-NEXT: 0 | int a
7171
// CHECK-X64-NEXT: 4 | struct AT t (empty)
7272
// CHECK-X64: 0 | int b

‎clang/test/SemaCXX/builtin-bswapg.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ void test_lambda_errors() {
135135

136136
lambda(1.0f);
137137
// expected-error@#lambda_use {{1st argument must be a scalar integer type (was 'float')}}
138-
// expected-note@-2 {{in instantiation of function template specialization 'test_lambda_errors()::(anonymous class)::operator()<float>' requested here}}
138+
// expected-note@-2 {{in instantiation of function template specialization 'test_lambda_errors()::(lambda)::operator()<float>' requested here}}
139139
lambda(1.0l);
140140
// expected-error@#lambda_use {{1st argument must be a scalar integer type (was 'long double')}}
141-
// expected-note@-2 {{in instantiation of function template specialization 'test_lambda_errors()::(anonymous class)::operator()<long double>' requested here}}
141+
// expected-note@-2 {{in instantiation of function template specialization 'test_lambda_errors()::(lambda)::operator()<long double>' requested here}}
142142
lambda("hello");
143143
// expected-error@#lambda_use {{1st argument must be a scalar integer type (was 'const char *')}}
144-
// expected-note@-2 {{in instantiation of function template specialization 'test_lambda_errors()::(anonymous class)::operator()<const char *>' requested here}}
144+
// expected-note@-2 {{in instantiation of function template specialization 'test_lambda_errors()::(lambda)::operator()<const char *>' requested here}}
145145
}
146146

147147
template <class... Args> void test_variadic_template_argument_count(Args... args) {

0 commit comments

Comments
 (0)