diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-11-17 23:32:01 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-11-17 23:32:01 +0000 |
| commit | 752ada870d7bc5759a80abde286c77e95ef77fb6 (patch) | |
| tree | 78ed50e92dbc86db3fa3f175bd7e8a9ac2781995 /clang/lib/Parse/ParseDecl.cpp | |
| parent | 70507e59fe06e187045ad1c6abd518495683f038 (diff) | |
| download | bcm5719-llvm-752ada870d7bc5759a80abde286c77e95ef77fb6.tar.gz bcm5719-llvm-752ada870d7bc5759a80abde286c77e95ef77fb6.zip | |
[modules] When a #include is mapped to a module import and appears somewhere
other than the top level, we issue an error. This breaks a fair amount of C++
code wrapping C libraries, where the C library is #included within a namespace
/ extern "C" combination, because the C library (probably) includes C++
standard library headers which may be within modules.
Without modules, this setup is harmless if (and *only* if) the corresponding
standard library module was already included outside the namespace, so
downgrade the error to a default-error extension in that case, so that it can
be selectively disabled for such misbehaving libraries.
llvm-svn: 253398
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 0c6e8bd4530..817970dd078 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -3589,8 +3589,8 @@ void Parser::ParseStructUnionBody(SourceLocation RecordLoc, SmallVector<Decl *, 32> FieldDecls; // While we still have something to read, read the declarations in the struct. - while (Tok.isNot(tok::r_brace) && Tok.isNot(tok::eof) && - !tryParseMisplacedModuleImport()) { + while (!tryParseMisplacedModuleImport() && Tok.isNot(tok::r_brace) && + Tok.isNot(tok::eof)) { // Each iteration of this loop reads one struct-declaration. // Check for extraneous top-level semicolon. |
