Tighter check in r116060 blcoked enums also. Emit enum const's debug info.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116071 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 8e01b7c2124b8d2b143cbb0b139ded878c9dc3e9..bc67eb8e0bd5ae51ca0d0be35cb9eb68ecbb1384 100644 (file)
--- 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);