diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index e60edce..503cc2a 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -542,9 +542,7 @@
     assert(VD->isFileVarDecl() && "Cannot emit local var decl as global.");
 
     // Forward declarations are emitted lazily on first use.
-    if ((VD->getStorageClass() == VarDecl::Extern ||
-         VD->getStorageClass() == VarDecl::PrivateExtern) && 
-        VD->getInit() == 0)
+    if (!VD->getInit() && VD->hasExternalStorage())
       return;
   }