[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

1 files changed, 5 insertions, 0 deletions

diff --git a/clang/test/Modules/Inputs/misplaced/misplaced-a.h b/clang/test/Modules/Inputs/misplaced/misplaced-a.h
new file mode 100644
index 00000000000..f50e5cefc3a
--- /dev/null
+++ b/clang/test/Modules/Inputs/misplaced/misplaced-a.h
@@ -0,0 +1,5 @@
+namespace A {
+  namespace B {  // expected-note{{namespace 'A::B' begins here}}
+    #include "misplaced-b.h"  // expected-error{{import of module 'Misplaced.Sub_B' appears within namespace 'A::B'}}
+  }
+}