summaryrefslogtreecommitdiffstats
path: root/clang/test/Modules/extern_c.cpp
diff options
context:
space:
mode:
authorSerge Pavlov <sepavloff@gmail.com>2015-09-19 05:32:57 +0000
committerSerge Pavlov <sepavloff@gmail.com>2015-09-19 05:32:57 +0000
commitc4e04a29640335082eec854bbfdcf3d3a1f897c3 (patch)
treeb969eed8446a32911bea64ca2705fe4dbc01f7b6 /clang/test/Modules/extern_c.cpp
parent0510cd5161bf66747bccf09dbbe6728029efa83c (diff)
downloadbcm5719-llvm-c4e04a29640335082eec854bbfdcf3d3a1f897c3.tar.gz
bcm5719-llvm-c4e04a29640335082eec854bbfdcf3d3a1f897c3.zip
[Modules] More descriptive diagnostics for misplaced import directive
If an import directive was put into wrong context, the error message was obscure, complaining on misbalanced braces. To get more descriptive messages, annotation tokens related to modules are processed where they must not be seen. Differential Revision: http://reviews.llvm.org/D11844 llvm-svn: 248085
Diffstat (limited to 'clang/test/Modules/extern_c.cpp')
-rw-r--r--clang/test/Modules/extern_c.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/test/Modules/extern_c.cpp b/clang/test/Modules/extern_c.cpp
index f505c11f7c9..c9b4b8435fd 100644
--- a/clang/test/Modules/extern_c.cpp
+++ b/clang/test/Modules/extern_c.cpp
@@ -68,7 +68,7 @@ namespace N {
extern "C" {
#endif
int f;
-#if !defined(CXX_HEADER)
+#if !defined(CXX_HEADER) && !defined(NAMESPACE)
// expected-error@-2 {{redefinition of 'f' as different kind of symbol}}
// expected-note@c-header.h:1 {{previous}}
#endif
@@ -78,4 +78,6 @@ namespace N {
}
#endif
+#if !defined(NAMESPACE)
suppress_expected_no_diagnostics_error error_here; // expected-error {{}}
+#endif
OpenPOWER on IntegriCloud