1 files changed, 3 insertions, 3 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 8e01b7c212..bc67eb8e0b 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -166,10 +166,10 @@ public:
       llvm::ConstantInt *CI 
         = llvm::ConstantInt::get(VMContext, Result.Val.getInt());
       if (VarDecl *VD = dyn_cast<VarDecl>((E->getDecl()))) {
-        if (!VD->isFileVarDecl()) {
+        if (!CGF.getContext().DeclMustBeEmitted(VD))
           CGF.EmitDeclRefExprDbgValue(E, CI);
-        }
-      }
+      } else if (isa<EnumConstantDecl>(E->getDecl()))
+        CGF.EmitDeclRefExprDbgValue(E, CI);        
       return CI;
     }
     return EmitLoadOfLValue(E);