diff options
| -rw-r--r-- | lib/Frontend/PCHReaderDecl.cpp | 3 | ||||
| -rw-r--r-- | test/PCH/cxx-required-decls.cpp | 1 | ||||
| -rw-r--r-- | test/PCH/cxx-required-decls.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp index 7557950e66..a6a68d9425 100644 --- a/lib/Frontend/PCHReaderDecl.cpp +++ b/lib/Frontend/PCHReaderDecl.cpp @@ -1350,7 +1350,8 @@ static bool isConsumerInterestedIn(Decl *D) { if (isa<FileScopeAsmDecl>(D)) return true; if (VarDecl *Var = dyn_cast<VarDecl>(D)) - return Var->isFileVarDecl() && Var->getInit(); + return Var->isFileVarDecl() && + Var->isThisDeclarationADefinition() == VarDecl::Definition; if (FunctionDecl *Func = dyn_cast<FunctionDecl>(D)) return Func->isThisDeclarationADefinition(); return isa<ObjCProtocolDecl>(D); diff --git a/test/PCH/cxx-required-decls.cpp b/test/PCH/cxx-required-decls.cpp index 818958ea1e..8c4b11cd84 100644 --- a/test/PCH/cxx-required-decls.cpp +++ b/test/PCH/cxx-required-decls.cpp @@ -7,3 +7,4 @@ // CHECK: @_ZL5globS = internal global %struct.S zeroinitializer // CHECK: @_ZL3bar = internal global i32 0, align 4 +// CHECK: @glob_var = global i32 0 diff --git a/test/PCH/cxx-required-decls.h b/test/PCH/cxx-required-decls.h index df28ad6c2f..099d2da56c 100644 --- a/test/PCH/cxx-required-decls.h +++ b/test/PCH/cxx-required-decls.h @@ -8,3 +8,5 @@ static S globS; extern int ext_foo; static int bar = ++ext_foo; + +int glob_var; |