Author: Reid Kleckner
Date: 2019-12-22T12:54:06-08:00
New Revision: 891e25b02d760d0de18c7d46947913b3166047e7

URL: 
https://github.com/llvm/llvm-project/commit/891e25b02d760d0de18c7d46947913b3166047e7
DIFF: 
https://github.com/llvm/llvm-project/commit/891e25b02d760d0de18c7d46947913b3166047e7.diff

LOG: Revert "[DebugInfo] Support to emit debugInfo for extern variables"

This reverts commit d77ae1552fc21a9f3877f3ed7e13d631f517c825.

The tests committed along with this change do not pass, and should be
changed to use %clang_cc1.

Added: 
    

Modified: 
    clang/include/clang/AST/ASTConsumer.h
    clang/include/clang/Basic/TargetInfo.h
    clang/include/clang/Sema/Sema.h
    clang/lib/Basic/Targets/BPF.h
    clang/lib/CodeGen/CGDebugInfo.cpp
    clang/lib/CodeGen/CGDebugInfo.h
    clang/lib/CodeGen/CodeGenAction.cpp
    clang/lib/CodeGen/CodeGenModule.cpp
    clang/lib/CodeGen/CodeGenModule.h
    clang/lib/CodeGen/ModuleBuilder.cpp
    clang/lib/Sema/Sema.cpp
    clang/lib/Sema/SemaDecl.cpp
    llvm/include/llvm/IR/DIBuilder.h
    llvm/lib/IR/DIBuilder.cpp
    llvm/lib/IR/DebugInfo.cpp
    llvm/unittests/Transforms/Utils/CloningTest.cpp

Removed: 
    clang/test/CodeGen/debug-info-extern-basic.c
    clang/test/CodeGen/debug-info-extern-duplicate.c
    clang/test/CodeGen/debug-info-extern-multi.c
    clang/test/CodeGen/debug-info-extern-unused.c


################################################################################
diff  --git a/clang/include/clang/AST/ASTConsumer.h 
b/clang/include/clang/AST/ASTConsumer.h
index ecdd8e873e1e..dc216a89c205 100644
--- a/clang/include/clang/AST/ASTConsumer.h
+++ b/clang/include/clang/AST/ASTConsumer.h
@@ -102,11 +102,6 @@ class ASTConsumer {
   /// modified by the introduction of an implicit zero initializer.
   virtual void CompleteTentativeDefinition(VarDecl *D) {}
 
-  /// CompleteExternalDeclaration - Callback invoked at the end of a 
translation
-  /// unit to notify the consumer that the given external declaration should be
-  /// completed.
-  virtual void CompleteExternalDeclaration(VarDecl *D) {}
-
   /// Callback invoked when an MSInheritanceAttr has been attached to a
   /// CXXRecordDecl.
   virtual void AssignInheritanceModel(CXXRecordDecl *RD) {}

diff  --git a/clang/include/clang/Basic/TargetInfo.h 
b/clang/include/clang/Basic/TargetInfo.h
index bc06f59d41d4..33cecdadc686 100644
--- a/clang/include/clang/Basic/TargetInfo.h
+++ b/clang/include/clang/Basic/TargetInfo.h
@@ -1389,9 +1389,6 @@ class TargetInfo : public virtual TransferrableTargetInfo,
 
   virtual void setAuxTarget(const TargetInfo *Aux) {}
 
-  /// Whether target allows debuginfo types for decl only variables.
-  virtual bool allowDebugInfoForExternalVar() const { return false; }
-
 protected:
   /// Copy type and layout related info.
   void copyAuxTarget(const TargetInfo *Aux);

diff  --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 41c0e1459199..8cce6fdb1259 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -668,9 +668,6 @@ class Sema final {
   /// All the tentative definitions encountered in the TU.
   TentativeDefinitionsType TentativeDefinitions;
 
-  /// All the external declarations encoutered and used in the TU.
-  SmallVector<VarDecl *, 4> ExternalDeclarations;
-
   typedef LazyVector<const DeclaratorDecl *, ExternalSemaSource,
                      &ExternalSemaSource::ReadUnusedFileScopedDecls, 2, 2>
     UnusedFileScopedDeclsType;

diff  --git a/clang/lib/Basic/Targets/BPF.h b/clang/lib/Basic/Targets/BPF.h
index b2f1831e960e..117f81430bf4 100644
--- a/clang/lib/Basic/Targets/BPF.h
+++ b/clang/lib/Basic/Targets/BPF.h
@@ -76,8 +76,6 @@ class LLVM_LIBRARY_VISIBILITY BPFTargetInfo : public 
TargetInfo {
     return None;
   }
 
-  bool allowDebugInfoForExternalVar() const override { return true; }
-
   CallingConvCheckResult checkCallingConvention(CallingConv CC) const override 
{
     switch (CC) {
     default:

diff  --git a/clang/lib/CodeGen/CGDebugInfo.cpp 
b/clang/lib/CodeGen/CGDebugInfo.cpp
index 675df309e3f0..8858e08f2a77 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -4485,7 +4485,7 @@ void CGDebugInfo::EmitGlobalVariable(llvm::GlobalVariable 
*Var,
 
     GVE = DBuilder.createGlobalVariableExpression(
         DContext, DeclName, LinkageName, Unit, LineNo, getOrCreateType(T, 
Unit),
-        Var->hasLocalLinkage(), true,
+        Var->hasLocalLinkage(),
         Expr.empty() ? nullptr : DBuilder.createExpression(Expr),
         getOrCreateStaticDataMemberDeclarationOrNull(D), TemplateParameters,
         Align);
@@ -4588,29 +4588,10 @@ void CGDebugInfo::EmitGlobalVariable(const ValueDecl 
*VD, const APValue &Init) {
 
   GV.reset(DBuilder.createGlobalVariableExpression(
       DContext, Name, StringRef(), Unit, getLineNumber(VD->getLocation()), Ty,
-      true, true, InitExpr, getOrCreateStaticDataMemberDeclarationOrNull(VarD),
+      true, InitExpr, getOrCreateStaticDataMemberDeclarationOrNull(VarD),
       TemplateParameters, Align));
 }
 
-void CGDebugInfo::EmitExternalVariable(llvm::GlobalVariable *Var,
-                                       const VarDecl *D) {
-  assert(DebugKind >= codegenoptions::LimitedDebugInfo);
-  if (D->hasAttr<NoDebugAttr>())
-    return;
-
-  auto Align = getDeclAlignIfRequired(D, CGM.getContext());
-  llvm::DIFile *Unit = getOrCreateFile(D->getLocation());
-  StringRef Name = D->getName();
-  llvm::DIType *Ty = getOrCreateType(D->getType(), Unit);
-
-  llvm::DIScope *DContext = getDeclContextDescriptor(D);
-  llvm::DIGlobalVariableExpression *GVE =
-      DBuilder.createGlobalVariableExpression(
-          DContext, Name, StringRef(), Unit, getLineNumber(D->getLocation()),
-          Ty, false, false, nullptr, nullptr, nullptr, Align);
-  Var->addDebugInfo(GVE);
-}
-
 llvm::DIScope *CGDebugInfo::getCurrentContextDescriptor(const Decl *D) {
   if (!LexicalBlockStack.empty())
     return LexicalBlockStack.back();

diff  --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h
index 90e9a61ebe96..fed79f0095b5 100644
--- a/clang/lib/CodeGen/CGDebugInfo.h
+++ b/clang/lib/CodeGen/CGDebugInfo.h
@@ -478,9 +478,6 @@ class CGDebugInfo {
   /// Emit a constant global variable's debug info.
   void EmitGlobalVariable(const ValueDecl *VD, const APValue &Init);
 
-  /// Emit information about an external variable.
-  void EmitExternalVariable(llvm::GlobalVariable *GV, const VarDecl *Decl);
-
   /// Emit C++ using directive.
   void EmitUsingDirective(const UsingDirectiveDecl &UD);
 

diff  --git a/clang/lib/CodeGen/CodeGenAction.cpp 
b/clang/lib/CodeGen/CodeGenAction.cpp
index 7f3f358d3d98..95521495e133 100644
--- a/clang/lib/CodeGen/CodeGenAction.cpp
+++ b/clang/lib/CodeGen/CodeGenAction.cpp
@@ -336,10 +336,6 @@ namespace clang {
       Gen->CompleteTentativeDefinition(D);
     }
 
-    void CompleteExternalDeclaration(VarDecl *D) override {
-      Gen->CompleteExternalDeclaration(D);
-    }
-
     void AssignInheritanceModel(CXXRecordDecl *RD) override {
       Gen->AssignInheritanceModel(RD);
     }

diff  --git a/clang/lib/CodeGen/CodeGenModule.cpp 
b/clang/lib/CodeGen/CodeGenModule.cpp
index 1fc2beb12ed5..02b2dd35bc9a 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -3730,10 +3730,6 @@ void CodeGenModule::EmitTentativeDefinition(const 
VarDecl *D) {
   EmitGlobalVarDefinition(D);
 }
 
-void CodeGenModule::EmitExternalDeclaration(const VarDecl *D) {
-  EmitExternalVarDeclaration(D);
-}
-
 CharUnits CodeGenModule::GetTargetTypeStoreSize(llvm::Type *Ty) const {
   return Context.toCharUnitsFromBits(
       getDataLayout().getTypeStoreSizeInBits(Ty));
@@ -4117,19 +4113,6 @@ void CodeGenModule::EmitGlobalVarDefinition(const 
VarDecl *D,
       DI->EmitGlobalVariable(GV, D);
 }
 
-void CodeGenModule::EmitExternalVarDeclaration(const VarDecl *D) {
-  if (CGDebugInfo *DI = getModuleDebugInfo())
-    if (getCodeGenOpts().getDebugInfo() >= codegenoptions::LimitedDebugInfo) {
-      QualType ASTTy = D->getType();
-      llvm::Type *Ty = getTypes().ConvertTypeForMem(D->getType());
-      llvm::PointerType *PTy =
-          llvm::PointerType::get(Ty, 
getContext().getTargetAddressSpace(ASTTy));
-      llvm::Constant *GV = GetOrCreateLLVMGlobal(D->getName(), PTy, D);
-      DI->EmitExternalVariable(
-          cast<llvm::GlobalVariable>(GV->stripPointerCasts()), D);
-    }
-}
-
 static bool isVarDeclStrongDefinition(const ASTContext &Context,
                                       CodeGenModule &CGM, const VarDecl *D,
                                       bool NoCommon) {

diff  --git a/clang/lib/CodeGen/CodeGenModule.h 
b/clang/lib/CodeGen/CodeGenModule.h
index 9bf1c5ef610e..673eda3baa66 100644
--- a/clang/lib/CodeGen/CodeGenModule.h
+++ b/clang/lib/CodeGen/CodeGenModule.h
@@ -1170,8 +1170,6 @@ class CodeGenModule : public CodeGenTypeCache {
 
   void EmitTentativeDefinition(const VarDecl *D);
 
-  void EmitExternalDeclaration(const VarDecl *D);
-
   void EmitVTable(CXXRecordDecl *Class);
 
   void RefreshTypeCacheForClass(const CXXRecordDecl *Class);
@@ -1407,7 +1405,6 @@ class CodeGenModule : public CodeGenTypeCache {
   void EmitMultiVersionFunctionDefinition(GlobalDecl GD, llvm::GlobalValue 
*GV);
 
   void EmitGlobalVarDefinition(const VarDecl *D, bool IsTentative = false);
-  void EmitExternalVarDeclaration(const VarDecl *D);
   void EmitAliasDefinition(GlobalDecl GD);
   void emitIFuncDefinition(GlobalDecl GD);
   void emitCPUDispatchDefinition(GlobalDecl GD);

diff  --git a/clang/lib/CodeGen/ModuleBuilder.cpp 
b/clang/lib/CodeGen/ModuleBuilder.cpp
index 01093cf20c18..4154f6ebe736 100644
--- a/clang/lib/CodeGen/ModuleBuilder.cpp
+++ b/clang/lib/CodeGen/ModuleBuilder.cpp
@@ -290,10 +290,6 @@ namespace {
       Builder->EmitTentativeDefinition(D);
     }
 
-    void CompleteExternalDeclaration(VarDecl *D) override {
-      Builder->EmitExternalDeclaration(D);
-    }
-
     void HandleVTable(CXXRecordDecl *RD) override {
       if (Diags.hasErrorOccurred())
         return;

diff  --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index 2cd158a8b43c..85548cbd8654 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -1136,13 +1136,6 @@ void Sema::ActOnEndOfTranslationUnit() {
       Consumer.CompleteTentativeDefinition(VD);
   }
 
-  for (auto D : ExternalDeclarations) {
-    if (!D || D->isInvalidDecl() || D->getPreviousDecl() || !D->isUsed())
-      continue;
-
-    Consumer.CompleteExternalDeclaration(D);
-  }
-
   // If there were errors, disable 'unused' warnings since they will mostly be
   // noise. Don't warn for a use from a module: either we should warn on all
   // file-scope declarations in modules or not at all, but whether the

diff  --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 8f68be716bd3..f05a92008bfd 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -12220,10 +12220,6 @@ void Sema::ActOnUninitializedDecl(Decl *RealDecl) {
         Diag(Var->getLocation(), diag::note_private_extern);
       }
 
-      if (Context.getTargetInfo().allowDebugInfoForExternalVar() &&
-          !Var->isInvalidDecl() && !getLangOpts().CPlusPlus)
-        ExternalDeclarations.push_back(Var);
-
       return;
 
     case VarDecl::TentativeDefinition:

diff  --git a/clang/test/CodeGen/debug-info-extern-basic.c 
b/clang/test/CodeGen/debug-info-extern-basic.c
deleted file mode 100644
index fab177d0ccf3..000000000000
--- a/clang/test/CodeGen/debug-info-extern-basic.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// REQUIRES: bpf-registered-target
-// RUN: %clang -target bpf -emit-llvm -S -g %s -o - | FileCheck %s
-
-extern char ch;
-int test() {
-  return ch;
-}
-
-int test2() {
-  extern char ch2;
-  return ch2;
-}
-
-extern int (*foo)(int);
-int test3() {
-  return foo(0);
-}
-
-// CHECK: distinct !DIGlobalVariable(name: "ch",{{.*}} type: 
![[CHART:[0-9]+]], isLocal: false, isDefinition: false
-// CHECK: distinct !DIGlobalVariable(name: "ch2",{{.*}} type: ![[CHART]], 
isLocal: false, isDefinition: false
-// CHECK: ![[CHART]] = !DIBasicType(name: "char", size: 8, encoding: 
DW_ATE_signed_char)
-
-// CHECK: distinct !DIGlobalVariable(name: "foo",{{.*}} type: 
![[FUNC:[0-9]+]], isLocal: false, isDefinition: false)
-// CHECK: ![[FUNC]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: 
![[SUB:[0-9]+]], size: 64)
-// CHECK: ![[SUB]] = !DISubroutineType(types: ![[TYPES:[0-9]+]])
-// CHECK: ![[TYPES]] = !{![[BASET:[0-9]+]], ![[BASET]]}
-// CHECK: ![[BASET]] = !DIBasicType(name: "int", size: 32, encoding: 
DW_ATE_signed)

diff  --git a/clang/test/CodeGen/debug-info-extern-duplicate.c 
b/clang/test/CodeGen/debug-info-extern-duplicate.c
deleted file mode 100644
index e3560af2ecbd..000000000000
--- a/clang/test/CodeGen/debug-info-extern-duplicate.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// REQUIRES: bpf-registered-target
-// RUN: %clang -target bpf -emit-llvm -S -g %s -o - | FileCheck %s
-
-extern char ch;
-extern char ch;
-int test() {
-  return ch;
-}
-
-// CHECK: distinct !DIGlobalVariable(name: "ch",{{.*}} type: ![[T:[0-9]+]], 
isLocal: false, isDefinition: false
-// CHECK-NOT: distinct !DIGlobalVariable(name: "ch"

diff  --git a/clang/test/CodeGen/debug-info-extern-multi.c 
b/clang/test/CodeGen/debug-info-extern-multi.c
deleted file mode 100644
index 4f9afcad2932..000000000000
--- a/clang/test/CodeGen/debug-info-extern-multi.c
+++ /dev/null
@@ -1,23 +0,0 @@
-// REQUIRES: bpf-registered-target
-// RUN: %clang -target bpf -emit-llvm -S -g %s -o - | FileCheck %s
-
-extern char ch;
-int test() {
-  extern short sh;
-  return ch + sh;
-}
-
-extern char (*foo)(char);
-int test2() {
-  return foo(0) + ch;
-}
-
-// CHECK: distinct !DIGlobalVariable(name: "ch",{{.*}} type: ![[Tch:[0-9]+]], 
isLocal: false, isDefinition: false
-// CHECK: distinct !DIGlobalVariable(name: "sh",{{.*}} type: ![[Tsh:[0-9]+]], 
isLocal: false, isDefinition: false
-// CHECK: ![[Tsh]] = !DIBasicType(name: "short", size: 16, encoding: 
DW_ATE_signed)
-
-// CHECK: distinct !DIGlobalVariable(name: "foo",{{.*}} type: 
![[Tptr:[0-9]+]], isLocal: false, isDefinition: false
-// ![[Tptr]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: 
![[Tsub:[0-9]+]], size: 64)
-// ![[Tsub]] = !DISubroutineType(types: ![[Tproto:[0-9]+]])
-// ![[Tproto]] = !{![[Tch]], ![[Tch]]}
-// CHECK: ![[Tch]] = !DIBasicType(name: "char", size: 8, encoding: 
DW_ATE_signed_char)

diff  --git a/clang/test/CodeGen/debug-info-extern-unused.c 
b/clang/test/CodeGen/debug-info-extern-unused.c
deleted file mode 100644
index 11de9556ed0e..000000000000
--- a/clang/test/CodeGen/debug-info-extern-unused.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// REQUIRES: bpf-registered-target
-// RUN: %clang -target bpf -emit-llvm -S -g %s -o - | FileCheck %s
-
-extern char ch;
-int test() {
-  return 0;
-}
-
-int test2() {
-  extern char ch2;
-  return 0;
-}
-
-extern int (*foo)(int);
-int test3() {
-  return 0;
-}
-
-int test4() {
-  extern int (*foo2)(int);
-  return 0;
-}
-
-// CHECK-NOT: distinct !DIGlobalVariable(name: "ch"
-// CHECK-NOT: distinct !DIGlobalVariable(name: "ch2"
-// CHECK-NOT: distinct !DIGlobalVariable(name: "foo"
-// CHECK-NOT: distinct !DIGlobalVariable(name: "foo2"

diff  --git a/llvm/include/llvm/IR/DIBuilder.h 
b/llvm/include/llvm/IR/DIBuilder.h
index 7c0c5f54bb7e..48c0007b2ea5 100644
--- a/llvm/include/llvm/IR/DIBuilder.h
+++ b/llvm/include/llvm/IR/DIBuilder.h
@@ -583,7 +583,7 @@ namespace llvm {
     ///                    specified)
     DIGlobalVariableExpression *createGlobalVariableExpression(
         DIScope *Context, StringRef Name, StringRef LinkageName, DIFile *File,
-        unsigned LineNo, DIType *Ty, bool isLocalToUnit, bool isDefined = true,
+        unsigned LineNo, DIType *Ty, bool isLocalToUnit,
         DIExpression *Expr = nullptr, MDNode *Decl = nullptr,
         MDTuple *templateParams = nullptr, uint32_t AlignInBits = 0);
 

diff  --git a/llvm/lib/IR/DIBuilder.cpp b/llvm/lib/IR/DIBuilder.cpp
index 9f5811d41b93..d918551a67c1 100644
--- a/llvm/lib/IR/DIBuilder.cpp
+++ b/llvm/lib/IR/DIBuilder.cpp
@@ -640,14 +640,13 @@ static void checkGlobalVariableScope(DIScope *Context) {
 
 DIGlobalVariableExpression *DIBuilder::createGlobalVariableExpression(
     DIScope *Context, StringRef Name, StringRef LinkageName, DIFile *F,
-    unsigned LineNumber, DIType *Ty, bool isLocalToUnit,
-    bool isDefined, DIExpression *Expr,
+    unsigned LineNumber, DIType *Ty, bool isLocalToUnit, DIExpression *Expr,
     MDNode *Decl, MDTuple *templateParams, uint32_t AlignInBits) {
   checkGlobalVariableScope(Context);
 
   auto *GV = DIGlobalVariable::getDistinct(
       VMContext, cast_or_null<DIScope>(Context), Name, LinkageName, F,
-      LineNumber, Ty, isLocalToUnit, isDefined, 
cast_or_null<DIDerivedType>(Decl),
+      LineNumber, Ty, isLocalToUnit, true, cast_or_null<DIDerivedType>(Decl),
       templateParams, AlignInBits);
   if (!Expr)
     Expr = createExpression();

diff  --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index fe8311923109..5bbd292582ee 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -1289,7 +1289,7 @@ LLVMMetadataRef 
LLVMDIBuilderCreateGlobalVariableExpression(
   return wrap(unwrap(Builder)->createGlobalVariableExpression(
       unwrapDI<DIScope>(Scope), {Name, NameLen}, {Linkage, LinkLen},
       unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), LocalToUnit,
-      true, unwrap<DIExpression>(Expr), unwrapDI<MDNode>(Decl),
+      unwrap<DIExpression>(Expr), unwrapDI<MDNode>(Decl),
       nullptr, AlignInBits));
 }
 

diff  --git a/llvm/unittests/Transforms/Utils/CloningTest.cpp 
b/llvm/unittests/Transforms/Utils/CloningTest.cpp
index 28ad4bc88077..3d0bd10e87a9 100644
--- a/llvm/unittests/Transforms/Utils/CloningTest.cpp
+++ b/llvm/unittests/Transforms/Utils/CloningTest.cpp
@@ -764,7 +764,7 @@ class CloneModule : public ::testing::Test {
 
     DBuilder.createGlobalVariableExpression(
         Subprogram, "unattached", "unattached", File, 1,
-        DBuilder.createNullPtrType(), false, true, Expr);
+        DBuilder.createNullPtrType(), false, Expr);
 
     auto *Entry = BasicBlock::Create(C, "", F);
     IBuilder.SetInsertPoint(Entry);


        
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to