1 files changed, 3 insertions, 9 deletions
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 12aa0a2b7c4..31da6df1efa 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -967,15 +967,9 @@ CodeGenFunction::tryEmitAsConstant(DeclRefExpr *refExpr) {
   // Emit as a constant.
   llvm::Constant *C = CGM.EmitConstantValue(result.Val, resultType, this);
 
-  // Make sure we emit a debug reference to the global variable.
-  // This should probably fire even for
-  if (isa<VarDecl>(value)) {
-    if (!getContext().DeclMustBeEmitted(cast<VarDecl>(value)))
-      EmitDeclRefExprDbgValue(refExpr, C);
-  } else {
-    assert(isa<EnumConstantDecl>(value));
-    EmitDeclRefExprDbgValue(refExpr, C);
-  }
+  // Make sure we emit a debug reference to the global variable or
+  // enumerator constant.
+  EmitValueDeclDbgValue(value, C);
 
   // If we emitted a reference constant, we need to dereference that.
   if (resultIsReference)