From 4ba81b2ee4f96cf25531e5e341c61a6d510913c9 Mon Sep 17 00:00:00 2001
From: Argyrios Kyrtzidis <akyrtzi@gmail.com>
Date: Thu, 5 Aug 2010 09:47:59 +0000
Subject: [PATCH] Make sure C++ variable definitions are actually passed to the
 consumer when loaded from PCH.

llvm-svn: 110322
---
 clang/lib/Frontend/PCHReaderDecl.cpp  | 3 ++-
 clang/test/PCH/cxx-required-decls.cpp | 1 +
 clang/test/PCH/cxx-required-decls.h   | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/clang/lib/Frontend/PCHReaderDecl.cpp b/clang/lib/Frontend/PCHReaderDecl.cpp
index 7557950e66d9..a6a68d942503 100644
--- a/clang/lib/Frontend/PCHReaderDecl.cpp
+++ b/clang/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/clang/test/PCH/cxx-required-decls.cpp b/clang/test/PCH/cxx-required-decls.cpp
index 818958ea1e9f..8c4b11cd8414 100644
--- a/clang/test/PCH/cxx-required-decls.cpp
+++ b/clang/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/clang/test/PCH/cxx-required-decls.h b/clang/test/PCH/cxx-required-decls.h
index df28ad6c2f8d..099d2da56c69 100644
--- a/clang/test/PCH/cxx-required-decls.h
+++ b/clang/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;