diff options
| author | Jordan Rose <jordan_rose@apple.com> | 2012-08-10 01:06:16 +0000 |
|---|---|---|
| committer | Jordan Rose <jordan_rose@apple.com> | 2012-08-10 01:06:16 +0000 |
| commit | 7c304f56eecbd03db7d222a05dfcd593750d50d3 (patch) | |
| tree | ab52a9bb6194d5f053a6cca3cfd68618e07b0e2c /test/ASTMerge | |
| parent | af6cf431ead1658e13338c6ac0e571755047f7c7 (diff) | |
Update VerifyDiagnosticConsumer to only get directives during parsing.
The old behavior was to re-scan any files (like modules) where we may have
directives but won't actually be parsing during the -verify invocation.
Now, we keep the old behavior in Debug builds as a sanity check (though
modules are a known entity), and expect all legitimate directives to come
from comments seen by the preprocessor.
This also affects the ARC migration tool, which captures diagnostics in
order to filter some out. This change adds an explicit cleanup to
CaptureDiagnosticsConsumer in order to let its sub-consumer handle the
real end of diagnostics.
This was originally split into four patches, but the tests do not run
cleanly without all four, so I've combined them into one commit.
Patches by Andy Gibbs, with slight modifications from me.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161650 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge')
| -rw-r--r-- | test/ASTMerge/function.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/ASTMerge/function.c b/test/ASTMerge/function.c index f97eceed98..320bca2a36 100644 --- a/test/ASTMerge/function.c +++ b/test/ASTMerge/function.c @@ -1,9 +1,15 @@ // 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: %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)' 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: function1.c:4:6: note: declared here with type 'void (void)' // CHECK: 2 errors generated + +// expected-error@3 {{external function 'f1' declared with incompatible types}} +// expected-note@2 {{declared here}} +// expected-error@5 {{external function 'f3' declared with incompatible types}} +// expected-note@4 {{declared here}} |