Revert r189649 because it was breaking sanitizer bots.

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

diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index 89e205902550cab5a369220572492f39b1282190..fe503982be3c9e1eb201280ff4e902c91adab9a4 100644 (file)
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -3142,31 +3142,14 @@ CGDebugInfo::getOrCreateStaticDataMemberDeclarationOrNull(const VarDecl *D) {
 }
 
 /// EmitGlobalVariable - Emit information about a global variable.
-/// \param VarOrInit either the global variable itself or the initializer
-/// \param D the global declaration
-void CGDebugInfo::EmitGlobalVariable(llvm::Value *VarOrInit,
+void CGDebugInfo::EmitGlobalVariable(llvm::GlobalVariable *Var,
                                      const VarDecl *D) {
   assert(DebugKind >= CodeGenOptions::LimitedDebugInfo);
   // Create global variable debug descriptor.
   llvm::DIFile Unit = getOrCreateFile(D->getLocation());
   unsigned LineNo = getLineNumber(D->getLocation());
-  StringRef DeclName = D->getName();
-  StringRef LinkageName;
-  bool IsLocalToUnit = true;
-
-  // For deferred global variables, the current source location is usually
-  // where they are being referenced. Do not change the current source location
-  // to the place where they are declared, lest we get a bogus line table.
-  // FIXME: maybe we do not need to set the source location here at all.
-  if (llvm::GlobalVariable *Var = dyn_cast<llvm::GlobalVariable>(VarOrInit)) {
-    setLocation(D->getLocation());
-    IsLocalToUnit = Var->hasInternalLinkage();
-    if (D->getDeclContext() && !isa<FunctionDecl>(D->getDeclContext())
-        && !isa<ObjCMethodDecl>(D->getDeclContext()))
-      LinkageName = Var->getName();
-    if (LinkageName == DeclName)
-      LinkageName = StringRef();
-  }
+
+  setLocation(D->getLocation());
 
   QualType T = D->getType();
   if (T->isIncompleteArrayType()) {
@@ -3178,11 +3161,18 @@ void CGDebugInfo::EmitGlobalVariable(llvm::Value *VarOrInit,
     T = CGM.getContext().getConstantArrayType(ET, ConstVal,
                                               ArrayType::Normal, 0);
   }
+  StringRef DeclName = D->getName();
+  StringRef LinkageName;
+  if (D->getDeclContext() && !isa<FunctionDecl>(D->getDeclContext())
+      && !isa<ObjCMethodDecl>(D->getDeclContext()))
+    LinkageName = Var->getName();
+  if (LinkageName == DeclName)
+    LinkageName = StringRef();
   llvm::DIDescriptor DContext =
     getContextDescriptor(dyn_cast<Decl>(D->getDeclContext()));
   llvm::DIGlobalVariable GV = DBuilder.createStaticVariable(
       DContext, DeclName, LinkageName, Unit, LineNo, getOrCreateType(T, Unit),
-      IsLocalToUnit, VarOrInit,
+      Var->hasInternalLinkage(), Var,
       getOrCreateStaticDataMemberDeclarationOrNull(D));
   DeclCache.insert(std::make_pair(D->getCanonicalDecl(), llvm::WeakVH(GV)));
 }
@@ -3213,16 +3203,26 @@ void CGDebugInfo::EmitGlobalVariable(llvm::GlobalVariable *Var,
                                 Var->hasInternalLinkage(), Var);
 }
 
-/// EmitEnumConstant - Emit debug info for an enumerator constant
-void CGDebugInfo::EmitEnumConstant(const EnumConstantDecl *ECD)
-{
+/// EmitGlobalVariable - Emit global variable's debug info.
+void CGDebugInfo::EmitGlobalVariable(const ValueDecl *VD,
+                                     llvm::Constant *Init) {
   assert(DebugKind >= CodeGenOptions::LimitedDebugInfo);
-  llvm::DIFile Unit = getOrCreateFile(ECD->getLocation());
-  llvm::DIType Ty = getOrCreateType(ECD->getType(), Unit);
-
-  const EnumDecl *ED = cast<EnumDecl>(ECD->getDeclContext());
-  assert(isa<EnumType>(ED->getTypeForDecl()) && "Enum without EnumType?");
-  Ty = getOrCreateType(QualType(ED->getTypeForDecl(), 0), Unit);
+  // Create the descriptor for the variable.
+  llvm::DIFile Unit = getOrCreateFile(VD->getLocation());
+  StringRef Name = VD->getName();
+  llvm::DIType Ty = getOrCreateType(VD->getType(), Unit);
+  if (const EnumConstantDecl *ECD = dyn_cast<EnumConstantDecl>(VD)) {
+    const EnumDecl *ED = cast<EnumDecl>(ECD->getDeclContext());
+    assert(isa<EnumType>(ED->getTypeForDecl()) && "Enum without EnumType?");
+    Ty = getOrCreateType(QualType(ED->getTypeForDecl(), 0), Unit);
+  }
+  // Do not use DIGlobalVariable for enums.
+  if (Ty.getTag() == llvm::dwarf::DW_TAG_enumeration_type)
+    return;
+  llvm::DIGlobalVariable GV = DBuilder.createStaticVariable(
+      Unit, Name, Name, Unit, getLineNumber(VD->getLocation()), Ty, true, Init,
+      getOrCreateStaticDataMemberDeclarationOrNull(cast<VarDecl>(VD)));
+  DeclCache.insert(std::make_pair(VD->getCanonicalDecl(), llvm::WeakVH(GV)));
 }
 
 llvm::DIScope CGDebugInfo::getCurrentContextDescriptor(const Decl *D) {

diff --git a/lib/CodeGen/CGDebugInfo.h b/lib/CodeGen/CGDebugInfo.h
index 9642a83dfddc239d9ba70aaa2badda1267185c34..a8ba14b8b3fe81714b0d4035c0a29175b9bdee66 100644 (file)
--- a/lib/CodeGen/CGDebugInfo.h
+++ b/lib/CodeGen/CGDebugInfo.h
@@ -264,13 +264,13 @@ public:
                                             CGBuilderTy &Builder);
 
   /// EmitGlobalVariable - Emit information about a global variable.
-  void EmitGlobalVariable(llvm::Value *VarOrInit, const VarDecl *Decl);
+  void EmitGlobalVariable(llvm::GlobalVariable *GV, const VarDecl *Decl);
 
   /// EmitGlobalVariable - Emit information about an objective-c interface.
   void EmitGlobalVariable(llvm::GlobalVariable *GV, ObjCInterfaceDecl *Decl);
 
-  /// EmitEnumConstant - Emit information about an enumerator constant
-  void EmitEnumConstant(const EnumConstantDecl *ECD);
+  /// EmitGlobalVariable - Emit global variable's debug info.
+  void EmitGlobalVariable(const ValueDecl *VD, llvm::Constant *Init);
 
   /// \brief - Emit C++ using directive.
   void EmitUsingDirective(const UsingDirectiveDecl &UD);

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 31da6df1efa592354da6166b7ca7028d83498f65..12aa0a2b7c43614e31768747d58eba7e8a1e31fb 100644 (file)
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -967,9 +967,15 @@ 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 or
-  // enumerator constant.
-  EmitValueDeclDbgValue(value, C);
+  // 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);
+  }
 
   // If we emitted a reference constant, we need to dereference that.
   if (resultIsReference)

diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index c0357238d21ce91952b83c3295e0189e4e553a31..20352f9f685e4f461ddf902e1f94b17fb5e5b5eb 100644 (file)
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -1376,27 +1376,12 @@ llvm::Value* CodeGenFunction::EmitVAListRef(const Expr* E) {
   return EmitLValue(E).getAddress();
 }
 
-void CodeGenFunction::EmitValueDeclDbgValue(const ValueDecl *Val,
-                                            llvm::Constant *Init) {
+void CodeGenFunction::EmitDeclRefExprDbgValue(const DeclRefExpr *E,
+                                              llvm::Constant *Init) {
   assert (Init && "Invalid DeclRefExpr initializer!");
-  CGDebugInfo *Dbg = getDebugInfo();
-  if (!Dbg ||
-      CGM.getCodeGenOpts().getDebugInfo() < CodeGenOptions::LimitedDebugInfo)
-    return;
-
-  // Make sure we emit a debug reference to the global variable.
-  if (const VarDecl *VD = dyn_cast<VarDecl>(Val)) {
-    // Do not duplicate DIE entry for local variables; they are not deferred
-    // like global variables are.
-    if (VD->isFileVarDecl() && !getLangOpts().EmitAllDecls &&
-        !getContext().DeclMustBeEmitted(Val))
-      Dbg->EmitGlobalVariable(Init, VD);
-
-  // Make sure we emit a debug reference to an enumerator constant.
-  } else {
-    assert(isa<EnumConstantDecl>(Val));
-    Dbg->EmitEnumConstant(dyn_cast<EnumConstantDecl>(Val));
-  }
+  if (CGDebugInfo *Dbg = getDebugInfo())
+    if (CGM.getCodeGenOpts().getDebugInfo() >= CodeGenOptions::LimitedDebugInfo)
+      Dbg->EmitGlobalVariable(E->getDecl(), Init);
 }
 
 CodeGenFunction::PeepholeProtection

diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index 9913c68fcf8733405a3ae611e911b913a0118b25..20c0b82553caf66a3bc300975d09ef559a3a0f01 100644 (file)
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -2047,8 +2047,7 @@ public:
   LValue EmitStmtExprLValue(const StmtExpr *E);
   LValue EmitPointerToDataMemberBinaryExpr(const BinaryOperator *E);
   LValue EmitObjCSelectorLValue(const ObjCSelectorExpr *E);
-  void   EmitValueDeclDbgValue(const ValueDecl *Val, llvm::Constant *Init);
-
+  void   EmitDeclRefExprDbgValue(const DeclRefExpr *E, llvm::Constant *Init);
 
   //===--------------------------------------------------------------------===//
   //                         Scalar Expression Emission

diff --git a/test/CodeGen/debug-info-line5.cpp b/test/CodeGen/debug-info-line5.cpp
deleted file mode 100644 (file)
index 0f10427..0000000
--- a/test/CodeGen/debug-info-line5.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %clang %s -g -gcolumn-info -S -emit-llvm -o - | FileCheck %s
-// Line table entries should reference this cpp file, not the header
-
-#include "debug-info-line5.h"
-
-int result;
-int foo(unsigned);
-
-int main()
-{
-  while ( 1 )
-  {
-    result = foo(Marker);
-  }
-  return result;
-}
-
-// CHECK: !{{[0-9]*}} = metadata !{i32 {{[0-9]*}}, i32 {{[0-9]*}}, null, metadata !"Marker", {{.*}} ; [ DW_TAG_variable ] [Marker]

diff --git a/test/CodeGen/debug-info-line5.h b/test/CodeGen/debug-info-line5.h
deleted file mode 100644 (file)
index 690c9b7..0000000
--- a/test/CodeGen/debug-info-line5.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Declaration of "Marker"
-const unsigned Marker = 0xFF999999;

diff --git a/test/CodeGen/debug-info-scope.c b/test/CodeGen/debug-info-scope.c
index 05cd299ff3667dc667ca6e3c1f18e7d76aaf5102..9decaeafd50ead8ebe005ba5112e7bc9f5fe00ca 100644 (file)
--- a/test/CodeGen/debug-info-scope.c
+++ b/test/CodeGen/debug-info-scope.c
@@ -1,16 +1,7 @@
 // RUN: %clang_cc1 -g -emit-llvm < %s | FileCheck %s
-
-// Make sure that the debug info of the local variable d does not shadow
-// the global variable d
-// CHECK: [ DW_TAG_variable ] [d] [line 6] [def]
-const int d = 100;
-
 // Two variables with same name in separate scope.
 // Radar 8330217.
 int main() {
-// CHECK-NOT: [ DW_TAG_variable ] [d] [line 13]
-// CHECK: [ DW_TAG_auto_variable ] [d] [line 13]
-       const int d = 4;
        int j = 0;
        int k = 0;
 // CHECK: DW_TAG_auto_variable ] [i]
@@ -21,5 +12,5 @@ int main() {
 // CHECK-NEXT: DW_TAG_lexical_block
        for (int i = 0; i < 10; i++)
                k++;
-       return d; // make a reference to d so that its debug info gets included
+       return 0;
 }

diff --git a/test/CodeGenCXX/debug-info-namespace.cpp b/test/CodeGenCXX/debug-info-namespace.cpp
index 17352e88182439837639dc4f98950709d7853256..ec7e69a0cc7bbe228508edf47bac61dc183601ab 100644 (file)
--- a/test/CodeGenCXX/debug-info-namespace.cpp
+++ b/test/CodeGenCXX/debug-info-namespace.cpp
@@ -39,16 +39,6 @@ int func(bool b) {
 // This should work even if 'i' and 'func' were declarations & not definitions,
 // but it doesn't yet.
 
-namespace C
-{
- const int j = 32;
-}
-
-int func2()
-{
- return C::j;
-} 
-
 // CHECK: [[CU:![0-9]*]] = {{.*}}[[MODULES:![0-9]*]], metadata !""} ; [ DW_TAG_compile_unit ]
 // CHECK: [[FILE:![0-9]*]] {{.*}}debug-info-namespace.cpp"
 // CHECK: [[FOO:![0-9]*]] {{.*}} ; [ DW_TAG_structure_type ] [foo] [line 5, size 0, align 0, offset 0] [decl] [from ]
@@ -60,8 +50,6 @@ int func2()
 // CHECK: [[FUNC:![0-9]*]] {{.*}} ; [ DW_TAG_subprogram ] {{.*}} [def] [func]
 // CHECK: [[FILE2]]} ; [ DW_TAG_file_type ] [{{.*}}foo.cpp]
 // CHECK: [[I:![0-9]*]] = {{.*}}, metadata [[NS]], metadata !"i", {{.*}} ; [ DW_TAG_variable ] [i]
-// CHECK: [[VAR:![0-9]*]] = {{.*}}, metadata [[SPACE:![0-9]*]], metadata !"j", {{.*}} ; [ DW_TAG_variable ] [j]
-// CHECK: [[SPACE]] = {{.*}}, metadata !"C", {{.*}} ; [ DW_TAG_namespace ] [C]
 // CHECK: [[MODULES]] = metadata !{metadata [[M1:![0-9]*]], metadata [[M2:![0-9]*]], metadata [[M3:![0-9]*]], metadata [[M4:![0-9]*]], metadata [[M5:![0-9]*]], metadata [[M6:![0-9]*]], metadata [[M7:![0-9]*]], metadata [[M8:![0-9]*]], metadata [[M9:![0-9]*]], metadata [[M10:![0-9]*]], metadata [[M11:![0-9]*]], metadata [[M12:![0-9]*]]}
 // CHECK: [[M1]] = metadata !{i32 {{[0-9]*}}, metadata [[CTXT]], metadata [[NS]], i32 11} ; [ DW_TAG_imported_module ]
 // CHECK: [[M2]] = metadata !{i32 {{[0-9]*}}, metadata [[CU]], metadata [[CTXT]], i32 {{[0-9]*}}} ; [ DW_TAG_imported_module ]