From cba0c265700b7b0741e1c6f6c513b7d2f05c1c4f Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 14 May 2019 19:02:39 +0000 Subject: [PATCH] Update ASTMerge FileCheck test expectations I belive many of these diagnostics changed from errors to warnings in r357394. I've simply mechanically updated the tests, but whoever owns this code should probably audit for unintented behavior changes. I wasn't able to find a flag to make these warnings errors again. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@360701 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/ASTMerge/category/test.m | 12 ++++------ .../class-template-partial-spec/test.cpp | 10 ++++---- test/ASTMerge/class-template/test.cpp | 16 ++++++------- test/ASTMerge/enum/test.c | 14 +++++------ test/ASTMerge/function/test.c | 14 +++++------ test/ASTMerge/interface/test.m | 20 +++++++--------- test/ASTMerge/namespace/test.cpp | 4 +--- test/ASTMerge/property/test.m | 14 +++++------ test/ASTMerge/struct/test.c | 24 +++++++++---------- test/ASTMerge/typedef/test.c | 8 +++---- test/ASTMerge/var/test.c | 12 ++++------ 11 files changed, 64 insertions(+), 84 deletions(-) diff --git a/test/ASTMerge/category/test.m b/test/ASTMerge/category/test.m index bee72f6756..c44a3b8324 100644 --- a/test/ASTMerge/category/test.m +++ b/test/ASTMerge/category/test.m @@ -1,13 +1,11 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/category1.m // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/category2.m -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s -// CHECK: category2.m:18:1: error: instance method 'method2' has incompatible result types in different translation units ('float' vs. 'int') +// CHECK: category2.m:18:1: warning: instance method 'method2' has incompatible result types in different translation units ('float' vs. 'int') // CHECK: category1.m:16:1: note: instance method 'method2' also declared here -// CHECK: category2.m:26:1: error: instance method 'method3' has incompatible result types in different translation units ('float' vs. 'int') +// CHECK: category2.m:26:1: warning: instance method 'method3' has incompatible result types in different translation units ('float' vs. 'int') // CHECK: category1.m:24:1: note: instance method 'method3' also declared here -// CHECK: category2.m:48:1: error: instance method 'blah' has incompatible result types in different translation units ('int' vs. 'float') +// CHECK: category2.m:48:1: warning: instance method 'blah' has incompatible result types in different translation units ('int' vs. 'float') // CHECK: category1.m:46:1: note: instance method 'blah' also declared here -// CHECK: 3 errors generated. +// CHECK: 3 warnings generated. diff --git a/test/ASTMerge/class-template-partial-spec/test.cpp b/test/ASTMerge/class-template-partial-spec/test.cpp index 9aa4ab5e3c..fdd0ebd488 100644 --- a/test/ASTMerge/class-template-partial-spec/test.cpp +++ b/test/ASTMerge/class-template-partial-spec/test.cpp @@ -1,8 +1,8 @@ -// FIXME: Errors are now warnings. +// FIXME: Crashes after r357394 // XFAIL: * // RUN: %clang_cc1 -emit-pch -std=c++1z -o %t.1.ast %S/Inputs/class-template-partial-spec1.cpp // RUN: %clang_cc1 -emit-pch -std=c++1z -o %t.2.ast %S/Inputs/class-template-partial-spec2.cpp -// RUN: not %clang_cc1 -std=c++1z -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -std=c++1z -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s static_assert(sizeof(**SingleSource.member) == sizeof(**SingleDest.member)); static_assert(sizeof(SecondDoubleSource.member) == sizeof(SecondDoubleDest.member)); @@ -11,17 +11,17 @@ static_assert(sizeof(Z0Source.member) == sizeof(char)); static_assert(sizeof(Dst::Z0Dst.member) == sizeof(double)); static_assert(sizeof(One::Child1>::member) == sizeof(double)); -// CHECK: class-template-partial-spec2.cpp:21:32: error: external variable 'X1' declared with incompatible types in different translation units ('TwoOptionTemplate' vs. 'TwoOptionTemplate') +// CHECK: class-template-partial-spec2.cpp:21:32: warning: external variable 'X1' declared with incompatible types in different translation units ('TwoOptionTemplate' vs. 'TwoOptionTemplate') // CHECK: class-template-partial-spec1.cpp:21:31: note: declared here with type 'TwoOptionTemplate' -// CHECK: class-template-partial-spec2.cpp:24:29: error: external variable 'X4' declared with incompatible types in different translation units ('TwoOptionTemplate' vs. 'TwoOptionTemplate') +// CHECK: class-template-partial-spec2.cpp:24:29: warning: external variable 'X4' declared with incompatible types in different translation units ('TwoOptionTemplate' vs. 'TwoOptionTemplate') // CHECK: class-template-partial-spec1.cpp:24:33: note: declared here with type 'TwoOptionTemplate' // CHECK: class-template-partial-spec1.cpp:38:8: warning: type 'IntTemplateSpec<5, void *>' has incompatible definitions in different translation units // CHECK: class-template-partial-spec1.cpp:39:7: note: field 'member' has type 'int' here // CHECK: class-template-partial-spec2.cpp:39:10: note: field 'member' has type 'double' here -// CHECK: class-template-partial-spec2.cpp:52:25: error: external variable 'Y3' declared with incompatible types in different translation units ('IntTemplateSpec<2, int>' vs. 'IntTemplateSpec<3, int>') +// CHECK: class-template-partial-spec2.cpp:52:25: warning: external variable 'Y3' declared with incompatible types in different translation units ('IntTemplateSpec<2, int>' vs. 'IntTemplateSpec<3, int>') // CHECK: class-template-partial-spec1.cpp:52:25: note: declared here with type 'IntTemplateSpec<3, int>' // CHECK-NOT: static_assert diff --git a/test/ASTMerge/class-template/test.cpp b/test/ASTMerge/class-template/test.cpp index f2ac4c5a63..27761f6983 100644 --- a/test/ASTMerge/class-template/test.cpp +++ b/test/ASTMerge/class-template/test.cpp @@ -1,30 +1,28 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -std=c++1z -emit-pch -o %t.1.ast %S/Inputs/class-template1.cpp // RUN: %clang_cc1 -std=c++1z -emit-pch -o %t.2.ast %S/Inputs/class-template2.cpp -// RUN: not %clang_cc1 -std=c++1z -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -std=c++1z -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s static_assert(sizeof(X0().getValue(1)) == sizeof(char)); static_assert(sizeof(X0().getValue(1)) == sizeof(int)); -// CHECK: class-template1.cpp:9:14: error: non-type template parameter declared with incompatible types in different translation units ('int' vs. 'long') +// CHECK: class-template1.cpp:9:14: warning: non-type template parameter declared with incompatible types in different translation units ('int' vs. 'long') // CHECK: class-template2.cpp:9:15: note: declared here with type 'long' -// CHECK: class-template1.cpp:12:14: error: template parameter has different kinds in different translation units +// CHECK: class-template1.cpp:12:14: warning: template parameter has different kinds in different translation units // CHECK: class-template2.cpp:12:10: note: template parameter declared here -// CHECK: class-template1.cpp:18:23: error: non-type template parameter declared with incompatible types in different translation units ('long' vs. 'int') +// CHECK: class-template1.cpp:18:23: warning: non-type template parameter declared with incompatible types in different translation units ('long' vs. 'int') // CHECK: class-template2.cpp:18:23: note: declared here with type 'int' -// CHECK: class-template1.cpp:21:10: error: template parameter has different kinds in different translation units +// CHECK: class-template1.cpp:21:10: warning: template parameter has different kinds in different translation units // CHECK: class-template2.cpp:21:10: note: template parameter declared here -// CHECK: class-template2.cpp:27:20: error: external variable 'x0r' declared with incompatible types in different translation units ('X0 *' vs. 'X0 *') +// CHECK: class-template2.cpp:27:20: warning: external variable 'x0r' declared with incompatible types in different translation units ('X0 *' vs. 'X0 *') // CHECK: class-template1.cpp:26:19: note: declared here with type 'X0 *' // CHECK: class-template1.cpp:35:8: warning: type 'X0' has incompatible definitions in different translation units // CHECK: class-template1.cpp:36:7: note: field 'member' has type 'int' here // CHECK: class-template2.cpp:36:9: note: field 'member' has type 'float' here -// CHECK: 1 warning and 5 errors generated. +// CHECK: 6 warnings generated. // CHECK-NOT: static_assert diff --git a/test/ASTMerge/enum/test.c b/test/ASTMerge/enum/test.c index 57f9278757..9a01065c6e 100644 --- a/test/ASTMerge/enum/test.c +++ b/test/ASTMerge/enum/test.c @@ -1,27 +1,25 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/enum1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/enum2.c -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: enum1.c:9:6: warning: type 'enum E2' has incompatible definitions in different translation units // CHECK: enum1.c:11:3: note: enumerator 'E2Enumerator2' with value 3 here // CHECK: enum2.c:11:3: note: enumerator 'E2Enumerator2' with value 4 here -// CHECK: enum2.c:13:3: error: external variable 'x2' declared with incompatible types in different translation units ('enum E2' vs. 'enum E2') +// CHECK: enum2.c:13:3: warning: external variable 'x2' declared with incompatible types in different translation units ('enum E2' vs. 'enum E2') // CHECK: enum1.c:13:3: note: declared here with type 'enum E2' // CHECK: enum1.c:16:6: warning: type 'enum E3' has incompatible definitions in different translation units // CHECK: enum1.c:18:3: note: enumerator 'E3Enumerator2' with value 3 here // CHECK: enum2.c:18:3: note: enumerator 'E3Enumerator' with value 3 here -// CHECK: enum2.c:20:3: error: external variable 'x3' declared with incompatible types in different translation units ('enum E3' vs. 'enum E3') +// CHECK: enum2.c:20:3: warning: external variable 'x3' declared with incompatible types in different translation units ('enum E3' vs. 'enum E3') // CHECK: enum1.c:20:3: note: declared here with type 'enum E3' // CHECK: enum1.c:23:6: warning: type 'enum E4' has incompatible definitions in different translation units // CHECK: enum1.c:26:3: note: enumerator 'E4Enumerator3' with value 2 here // CHECK: enum2.c:23:6: note: no corresponding enumerator here -// CHECK: enum2.c:26:3: error: external variable 'x4' declared with incompatible types in different translation units ('enum E4' vs. 'enum E4') +// CHECK: enum2.c:26:3: warning: external variable 'x4' declared with incompatible types in different translation units ('enum E4' vs. 'enum E4') // CHECK: enum1.c:27:3: note: declared here with type 'enum E4' // CHECK: enum1.c:30:6: warning: type 'enum E5' has incompatible definitions in different translation units // CHECK: enum2.c:33:3: note: enumerator 'E5Enumerator4' with value 3 here // CHECK: enum1.c:30:6: note: no corresponding enumerator here -// CHECK: enum2.c:34:3: error: external variable 'x5' declared with incompatible types in different translation units ('enum E5' vs. 'enum E5') +// CHECK: enum2.c:34:3: warning: external variable 'x5' declared with incompatible types in different translation units ('enum E5' vs. 'enum E5') // CHECK: enum1.c:34:3: note: declared here with type 'enum E5' -// CHECK: 4 warnings and 4 errors generated +// CHECK: 8 warnings generated diff --git a/test/ASTMerge/function/test.c b/test/ASTMerge/function/test.c index 8d4d0c15f2..3556347366 100644 --- a/test/ASTMerge/function/test.c +++ b/test/ASTMerge/function/test.c @@ -1,17 +1,15 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/function1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/function2.c -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s -// CHECK: function2.c:3:6: error: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' (aka 'void (int, double)') vs. 'void (int, float)') +// CHECK: function2.c:3:6: warning: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' (aka 'void (int, double)') vs. 'void (int, float)') // CHECK: function1.c:2:6: note: declared here with type 'void (int, float)' -// CHECK: function2.c:5:6: error: external function 'f3' declared with incompatible types in different translation units ('void (int)' vs. 'void (void)') +// CHECK: function2.c:5:6: warning: external function 'f3' declared with incompatible types in different translation units ('void (int)' vs. 'void (void)') // CHECK: function1.c:4:6: note: declared here with type 'void (void)' -// CHECK: 2 errors generated +// CHECK: 2 warnings generated -// expected-error@Inputs/function2.c:3 {{external function 'f1' declared with incompatible types}} +// expected-warning@Inputs/function2.c:3 {{external function 'f1' declared with incompatible types}} // expected-note@Inputs/function1.c:2 {{declared here}} -// expected-error@Inputs/function2.c:5 {{external function 'f3' declared with incompatible types}} +// expected-warning@Inputs/function2.c:5 {{external function 'f3' declared with incompatible types}} // expected-note@Inputs/function1.c:4 {{declared here}} diff --git a/test/ASTMerge/interface/test.m b/test/ASTMerge/interface/test.m index 7338e903f1..229a334c41 100644 --- a/test/ASTMerge/interface/test.m +++ b/test/ASTMerge/interface/test.m @@ -1,24 +1,22 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/interface1.m // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/interface2.m -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s -// CHECK: interface2.m:16:9: error: instance variable 'ivar2' declared with incompatible types in different translation units ('float' vs. 'int') +// CHECK: interface2.m:16:9: warning: instance variable 'ivar2' declared with incompatible types in different translation units ('float' vs. 'int') // CHECK: interface1.m:16:7: note: declared here with type 'int' -// CHECK: interface1.m:21:12: error: class 'I4' has incompatible superclasses +// CHECK: interface1.m:21:12: warning: class 'I4' has incompatible superclasses // CHECK: interface1.m:21:17: note: inherits from superclass 'I2' here // CHECK: interface2.m:21:17: note: inherits from superclass 'I1' here -// CHECK: interface2.m:33:1: error: class method 'foo' has incompatible result types in different translation units ('float' vs. 'int') +// CHECK: interface2.m:33:1: warning: class method 'foo' has incompatible result types in different translation units ('float' vs. 'int') // CHECK: interface1.m:34:1: note: class method 'foo' also declared here -// CHECK: interface2.m:39:19: error: class method 'bar:' has a parameter with a different types in different translation units ('float' vs. 'int') +// CHECK: interface2.m:39:19: warning: class method 'bar:' has a parameter with a different types in different translation units ('float' vs. 'int') // CHECK: interface1.m:40:17: note: declared here with type 'int' -// CHECK: interface2.m:45:1: error: class method 'bar:' is variadic in one translation unit and not variadic in another +// CHECK: interface2.m:45:1: warning: class method 'bar:' is variadic in one translation unit and not variadic in another // CHECK: interface1.m:46:1: note: class method 'bar:' also declared here -// CHECK: interface2.m:57:20: error: instance method 'bar:' has a parameter with a different types in different translation units ('double' vs. 'float') +// CHECK: interface2.m:57:20: warning: instance method 'bar:' has a parameter with a different types in different translation units ('double' vs. 'float') // CHECK: interface1.m:58:19: note: declared here with type 'float' -// CHECK: interface1.m:100:17: error: class 'I15' has incompatible superclasses +// CHECK: interface1.m:100:17: warning: class 'I15' has incompatible superclasses // CHECK: interface1.m:100:17: note: inherits from superclass 'I12' here // CHECK: interface2.m:99:17: note: inherits from superclass 'I11' here -// CHECK: 8 errors generated +// CHECK: 8 warnings generated diff --git a/test/ASTMerge/namespace/test.cpp b/test/ASTMerge/namespace/test.cpp index f0f8b73ffc..5e0d9ee510 100644 --- a/test/ASTMerge/namespace/test.cpp +++ b/test/ASTMerge/namespace/test.cpp @@ -1,5 +1,3 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -std=c++1z -o %t.1.ast %S/Inputs/namespace1.cpp // RUN: %clang_cc1 -emit-pch -std=c++1z -o %t.2.ast %S/Inputs/namespace2.cpp // RUN: not %clang_cc1 -std=c++1z -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s @@ -15,5 +13,5 @@ void testImport() { } -// CHECK: namespace2.cpp:16:17: error: external variable 'z' declared with incompatible types in different translation units ('double' vs. 'float') +// CHECK: namespace2.cpp:16:17: warning: external variable 'z' declared with incompatible types in different translation units ('double' vs. 'float') // CHECK: namespace1.cpp:16:16: note: declared here with type 'float' diff --git a/test/ASTMerge/property/test.m b/test/ASTMerge/property/test.m index e48d54ed08..4051250143 100644 --- a/test/ASTMerge/property/test.m +++ b/test/ASTMerge/property/test.m @@ -1,15 +1,13 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/property1.m // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/property2.m -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s -// CHECK: property2.m:12:26: error: property 'Prop1' declared with incompatible types in different translation units ('int' vs. 'float') +// CHECK: property2.m:12:26: warning: property 'Prop1' declared with incompatible types in different translation units ('int' vs. 'float') // CHECK: property1.m:10:28: note: declared here with type 'float' -// CHECK: property2.m:12:26: error: instance method 'Prop1' has incompatible result types in different translation units ('int' vs. 'float') +// CHECK: property2.m:12:26: warning: instance method 'Prop1' has incompatible result types in different translation units ('int' vs. 'float') // CHECK: property1.m:10:28: note: instance method 'Prop1' also declared here -// CHECK: property1.m:28:21: error: property 'Prop2' is synthesized to different ivars in different translation units ('ivar3' vs. 'ivar2') +// CHECK: property1.m:28:21: warning: property 'Prop2' is synthesized to different ivars in different translation units ('ivar3' vs. 'ivar2') // CHECK: property2.m:29:21: note: property is synthesized to ivar 'ivar2' here -// CHECK: property1.m:29:10: error: property 'Prop3' is implemented with @dynamic in one translation but @synthesize in another translation unit +// CHECK: property1.m:29:10: warning: property 'Prop3' is implemented with @dynamic in one translation but @synthesize in another translation unit // CHECK: property2.m:31:13: note: property 'Prop3' is implemented with @synthesize here -// CHECK: 4 errors generated. +// CHECK: 4 warnings generated. diff --git a/test/ASTMerge/struct/test.c b/test/ASTMerge/struct/test.c index 1f5f66da3c..9ac66d17f6 100644 --- a/test/ASTMerge/struct/test.c +++ b/test/ASTMerge/struct/test.c @@ -1,37 +1,35 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/struct1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/struct2.c -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: struct1.c:13:8: warning: type 'struct S1' has incompatible definitions in different translation units // CHECK: struct1.c:15:7: note: field 'field2' has type 'int' here // CHECK: struct2.c:12:9: note: field 'field2' has type 'float' here -// CHECK: struct2.c:15:11: error: external variable 'x1' declared with incompatible types in different translation units ('struct S1' vs. 'struct S1') +// CHECK: struct2.c:15:11: warning: external variable 'x1' declared with incompatible types in different translation units ('struct S1' vs. 'struct S1') // CHECK: struct1.c:18:11: note: declared here with type 'struct S1' // CHECK: struct1.c:21:8: warning: type 'struct S2' has incompatible definitions in different translation units // CHECK: struct2.c:18:7: note: 'S2' is a union here -// CHECK: struct2.c:18:30: error: external variable 'x2' declared with incompatible types in different translation units ('union S2' vs. 'struct S2') +// CHECK: struct2.c:18:30: warning: external variable 'x2' declared with incompatible types in different translation units ('union S2' vs. 'struct S2') // CHECK: struct1.c:21:31: note: declared here with type 'struct S2' // CHECK: struct1.c:24:8: warning: type 'struct S3' has incompatible definitions in different translation units // CHECK: struct1.c:24:36: note: field 'd' has type 'double' here // CHECK: struct2.c:21:8: note: no corresponding field here -// CHECK: struct2.c:21:31: error: external variable 'x3' declared with incompatible types in different translation units ('struct S3' vs. 'struct S3') +// CHECK: struct2.c:21:31: warning: external variable 'x3' declared with incompatible types in different translation units ('struct S3' vs. 'struct S3') // CHECK: struct1.c:24:41: note: declared here with type 'struct S3' // CHECK: struct1.c:27:8: warning: type 'struct S4' has incompatible definitions in different translation units // CHECK: struct2.c:24:26: note: field 'f' has type 'float' here // CHECK: struct1.c:27:8: note: no corresponding field here -// CHECK: struct2.c:24:31: error: external variable 'x4' declared with incompatible types in different translation units ('struct S4' vs. 'struct S4') +// CHECK: struct2.c:24:31: warning: external variable 'x4' declared with incompatible types in different translation units ('struct S4' vs. 'struct S4') // CHECK: struct1.c:27:22: note: declared here with type 'struct S4' // CHECK: struct1.c:33:8: warning: type 'struct S6' has incompatible definitions in different translation units // CHECK: struct1.c:33:33: note: bit-field 'j' with type 'unsigned int' and length 8 here // CHECK: struct2.c:30:33: note: field 'j' is not a bit-field -// CHECK: struct2.c:30:38: error: external variable 'x6' declared with incompatible types in different translation units ('struct S6' vs. 'struct S6') +// CHECK: struct2.c:30:38: warning: external variable 'x6' declared with incompatible types in different translation units ('struct S6' vs. 'struct S6') // CHECK: struct1.c:33:42: note: declared here with type 'struct S6' // CHECK: struct1.c:36:8: warning: type 'struct S7' has incompatible definitions in different translation units // CHECK: struct1.c:36:33: note: bit-field 'j' with type 'unsigned int' and length 8 here // CHECK: struct2.c:33:33: note: bit-field 'j' with type 'unsigned int' and length 16 here -// CHECK: struct2.c:33:43: error: external variable 'x7' declared with incompatible types in different translation units ('struct S7' vs. 'struct S7') +// CHECK: struct2.c:33:43: warning: external variable 'x7' declared with incompatible types in different translation units ('struct S7' vs. 'struct S7') // CHECK: struct1.c:36:42: note: declared here with type 'struct S7' // CHECK: struct1.c:56:10: warning: type 'struct DeeperError' has incompatible definitions in different translation units // CHECK: struct1.c:56:35: note: field 'f' has type 'int' here @@ -39,12 +37,12 @@ // CHECK: struct1.c:54:8: warning: type 'struct DeepError' has incompatible definitions in different translation units // CHECK: struct1.c:56:41: note: field 'Deeper' has type 'struct DeeperError *' here // CHECK: struct2.c:53:43: note: field 'Deeper' has type 'struct DeeperError *' here -// CHECK: struct2.c:54:3: error: external variable 'xDeep' declared with incompatible types in different translation units ('struct DeepError' vs. 'struct DeepError') +// CHECK: struct2.c:54:3: warning: external variable 'xDeep' declared with incompatible types in different translation units ('struct DeepError' vs. 'struct DeepError') // CHECK: struct1.c:57:3: note: declared here with type 'struct DeepError' // CHECK: struct1.c:74:9: warning: type 'S13' has incompatible definitions in different translation units // CHECK: struct1.c:75:9: note: field 'i' has type 'Float' (aka 'float') here // CHECK: struct2.c:72:7: note: field 'i' has type 'int' here -// CHECK: struct2.c:76:5: error: external variable 'x13' declared with incompatible types in different translation units ('S13' vs. 'S13') +// CHECK: struct2.c:76:5: warning: external variable 'x13' declared with incompatible types in different translation units ('S13' vs. 'S13') // CHECK: struct1.c:79:5: note: declared here with type 'S13' // CHECK: struct1.c:130:7: warning: type 'struct DeepUnnamedError::(anonymous at [[PATH_TO_INPUTS:.+]]struct1.c:130:7)' has incompatible definitions in different translation units // CHECK: struct1.c:131:14: note: field 'i' has type 'long' here @@ -52,6 +50,6 @@ // CHECK: struct1.c:129:5: warning: type 'union DeepUnnamedError::(anonymous at [[PATH_TO_INPUTS]]struct1.c:129:5)' has incompatible definitions in different translation units // CHECK: struct1.c:132:9: note: field 'S' has type 'struct (anonymous struct at [[PATH_TO_INPUTS]]struct1.c:130:7)' here // CHECK: struct2.c:129:9: note: field 'S' has type 'struct (anonymous struct at [[PATH_TO_INPUTS]]struct2.c:127:7)' here -// CHECK: struct2.c:138:3: error: external variable 'x16' declared with incompatible types in different translation units ('struct DeepUnnamedError' vs. 'struct DeepUnnamedError') +// CHECK: struct2.c:138:3: warning: external variable 'x16' declared with incompatible types in different translation units ('struct DeepUnnamedError' vs. 'struct DeepUnnamedError') // CHECK: struct1.c:141:3: note: declared here with type 'struct DeepUnnamedError' -// CHECK: 11 warnings and 9 errors generated +// CHECK: 20 warnings generated diff --git a/test/ASTMerge/typedef/test.c b/test/ASTMerge/typedef/test.c index ec8355d669..902ec8d5fd 100644 --- a/test/ASTMerge/typedef/test.c +++ b/test/ASTMerge/typedef/test.c @@ -1,9 +1,7 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/typedef1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/typedef2.c -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s -// CHECK: typedef2.c:4:10: error: external variable 'x2' declared with incompatible types in different translation units ('Typedef2' (aka 'double') vs. 'Typedef2' (aka 'int')) +// CHECK: typedef2.c:4:10: warning: external variable 'x2' declared with incompatible types in different translation units ('Typedef2' (aka 'double') vs. 'Typedef2' (aka 'int')) // CHECK: typedef1.c:4:10: note: declared here with type 'Typedef2' (aka 'int') -// CHECK: 1 error +// CHECK: 1 warning generated diff --git a/test/ASTMerge/var/test.c b/test/ASTMerge/var/test.c index f0a3d92b7d..a43de77bfe 100644 --- a/test/ASTMerge/var/test.c +++ b/test/ASTMerge/var/test.c @@ -1,14 +1,12 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/var1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/var2.c -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -fdiagnostics-show-note-include-stack %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -fdiagnostics-show-note-include-stack %s 2>&1 | FileCheck %s -// CHECK: var2.c:2:9: error: external variable 'x1' declared with incompatible types in different translation units ('double *' vs. 'float **') +// CHECK: var2.c:2:9: warning: external variable 'x1' declared with incompatible types in different translation units ('double *' vs. 'float **') // CHECK: var1.c:2:9: note: declared here with type 'float **' -// CHECK: var2.c:3:5: error: external variable 'x2' declared with incompatible types in different translation units ('int' vs. 'double') +// CHECK: var2.c:3:5: warning: external variable 'x2' declared with incompatible types in different translation units ('int' vs. 'double') // CHECK: In file included from{{.*}}var1.c:3: // CHECK: var1.h:1:8: note: declared here with type 'double' -// CHECK: error: external variable 'xarray3' declared with incompatible types in different translation units ('int [17]' vs. 'int [18]') +// CHECK: warning: external variable 'xarray3' declared with incompatible types in different translation units ('int [17]' vs. 'int [18]') // CHECK: var1.c:7:5: note: declared here with type 'int [18]' -// CHECK: 3 errors +// CHECK: 3 warnings generated -- 2.40.0