diff options
| -rw-r--r-- | lib/Serialization/ASTReaderDecl.cpp | 4 | ||||
| -rw-r--r-- | test/PCH/empty-def-fwd-struct.h | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp index c691919339..707a9249dd 100644 --- a/lib/Serialization/ASTReaderDecl.cpp +++ b/lib/Serialization/ASTReaderDecl.cpp @@ -2513,8 +2513,8 @@ static bool isConsumerInterestedIn(ASTContext &Ctx, Decl *D, bool HasBody) { // An ImportDecl or VarDecl imported from a module will get emitted when // we import the relevant module. - if ((isa<ImportDecl>(D) || isa<VarDecl>(D)) && Ctx.DeclMustBeEmitted(D) && - D->getImportedOwningModule()) + if ((isa<ImportDecl>(D) || isa<VarDecl>(D)) && D->getImportedOwningModule() && + Ctx.DeclMustBeEmitted(D)) return false; if (isa<FileScopeAsmDecl>(D) || diff --git a/test/PCH/empty-def-fwd-struct.h b/test/PCH/empty-def-fwd-struct.h new file mode 100644 index 0000000000..dda9827ac8 --- /dev/null +++ b/test/PCH/empty-def-fwd-struct.h @@ -0,0 +1,12 @@ +// RUN: %clang_cc1 -emit-pch -x c++-header %s -std=c++14 -o %t.pch +// RUN: %clang_cc1 -emit-llvm-only -x c++ /dev/null -std=c++14 -include-pch %t.pch -o %t.o +struct FVector; +struct FVector {}; +struct FBox { + FVector Min; + FBox(int); +}; +namespace { +FBox InvalidBoundingBox(0); +} + |