From 7442d6faa2719e4e7d33a7021c406c5a4facd74d Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 16 Apr 2017 16:02:28 +0000 Subject: Vendor import of clang trunk r300422: https://llvm.org/svn/llvm-project/cfe/trunk@300422 --- test/ASTMerge/struct/test.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'test/ASTMerge/struct/test.c') diff --git a/test/ASTMerge/struct/test.c b/test/ASTMerge/struct/test.c index 4f41cea26b189..ed7750f6becca 100644 --- a/test/ASTMerge/struct/test.c +++ b/test/ASTMerge/struct/test.c @@ -39,4 +39,9 @@ // 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: struct1.c:57:3: note: declared here with type 'struct DeepError' -// CHECK: 8 warnings and 7 errors generated +// 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: struct1.c:79:5: note: declared here with type 'S13' +// CHECK: 9 warnings and 8 errors generated -- cgit v1.2.3