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

llvm-svn: 116071

Author: Devang Patel

clang/lib/CodeGen/CGExprScalar.cpp

@@ -166,10 +166,10 @@ class ScalarExprEmitter
       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);