Strip most of the DIExpr-based implementation (llvm#1323)

Author: slinder1

clang/include/clang/Basic/CodeGenOptions.h

@@ -166,18 +166,11 @@ class CodeGenOptions : public CodeGenOptionsBase {
 
   enum class HeterogeneousDwarfOpts {
     Disabled,     //< Do not emit any heterogeneous dwarf metadata.
-    DIExpr,       //< Enable DIExpr-based metadata.
     DIExpression, //< Enable DIExpression-based metadata.
   };
   bool isHeterogeneousDwarfEnabled() const {
     return getHeterogeneousDwarfMode() != HeterogeneousDwarfOpts::Disabled;
   }
-  bool isHeterogeneousDwarfDIExpr() const {
-    return getHeterogeneousDwarfMode() == HeterogeneousDwarfOpts::DIExpr;
-  }
-  bool isHeterogeneousDwarfDIExpression() const {
-    return getHeterogeneousDwarfMode() == HeterogeneousDwarfOpts::DIExpression;
-  }
 
   enum AssignmentTrackingOpts {
     Disabled,

clang/include/clang/Driver/Options.td

@@ -4615,9 +4615,9 @@ def gdwarf32 : Flag<["-"], "gdwarf32">, Group<g_Group>,
 def gheterogeneous_dwarf_EQ : Joined<["-"], "gheterogeneous-dwarf=">,
   Group<g_Group>, Visibility<[ClangOption, CC1Option]>,
   HelpText<"Control DWARF extensions for heterogeneous debugging">,
-  Values<"disabled,diexpr,diexpression">,
+  Values<"disabled,diexpression">,
   NormalizedValuesScope<"CodeGenOptions::HeterogeneousDwarfOpts">,
-  NormalizedValues<["Disabled","DIExpr","DIExpression"]>,
+  NormalizedValues<["Disabled","DIExpression"]>,
   MarshallingInfoEnum<CodeGenOpts<"HeterogeneousDwarfMode">, "Disabled">;
 def gheterogeneous_dwarf : Flag<["-"], "gheterogeneous-dwarf">, Group<g_Group>,
   Visibility<[ClangOption, CC1Option]>,

clang/lib/CodeGen/CGDebugInfo.cpp

@@ -4875,7 +4875,8 @@ llvm::DILocalVariable *CGDebugInfo::EmitDeclare(const VarDecl *VD,
                                                 CGBuilderTy &Builder,
                                                 const bool UsePointerValue) {
   if (CGM.getCodeGenOpts().isHeterogeneousDwarfEnabled())
-    return EmitDef(VD, Storage, ArgNo, Builder, UsePointerValue);
+    return EmitDeclareForHeterogeneousDwarf(VD, Storage, ArgNo, Builder,
+                                            UsePointerValue);
 
   assert(CGM.getCodeGenOpts().hasReducedDebugInfo());
   assert(!LexicalBlockStack.empty() && "Region stack mismatch, stack empty!");
@@ -5057,11 +5058,9 @@ llvm::DILocalVariable *CGDebugInfo::EmitDeclare(const VarDecl *VD,
   return D;
 }
 
-llvm::DILocalVariable *CGDebugInfo::EmitDef(const BindingDecl *BD,
-                                            llvm::Value *Storage,
-                                            std::optional<unsigned> ArgNo,
-                                            CGBuilderTy &Builder,
-                                            const bool UsePointerValue) {
+llvm::DILocalVariable *CGDebugInfo::EmitDeclareForHeterogeneousDwarf(
+    const BindingDecl *BD, llvm::Value *Storage, std::optional<unsigned> ArgNo,
+    CGBuilderTy &Builder, const bool UsePointerValue) {
   assert(CGM.getCodeGenOpts().hasReducedDebugInfo());
   assert(!LexicalBlockStack.empty() && "Region stack mismatch, stack empty!");
   if (BD->hasAttr<NoDebugAttr>())
@@ -5083,10 +5082,7 @@ llvm::DILocalVariable *CGDebugInfo::EmitDef(const BindingDecl *BD,
       CGM.getTypes().ConvertTypeForMem(BD->getDecomposedDecl()->getType());
 
   llvm::DIExprBuilder ExprBuilder(CGM.getLLVMContext());
-  if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr())
-    ExprBuilder.append<llvm::DIOp::Referrer>(Storage->getType());
-  else
-    ExprBuilder.append<llvm::DIOp::Arg>(0u, Storage->getType());
+  ExprBuilder.append<llvm::DIOp::Arg>(0u, Storage->getType());
   ExprBuilder.append<llvm::DIOp::Deref>(DecomposedTy);
 
   if (UsePointerValue) {
@@ -5135,25 +5131,16 @@ llvm::DILocalVariable *CGDebugInfo::EmitDef(const BindingDecl *BD,
     }
   }
 
-  if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr())
-    DBuilder.insertDef(
-        DBuilder.createBoundedLifetime(D, ExprBuilder.intoExpr()), Storage,
-        llvm::DILocation::get(CGM.getLLVMContext(), Line, Column, Scope,
-                              CurInlinedAt),
-        Builder.GetInsertBlock());
-  else
-    DBuilder.insertDeclare(Storage, D, ExprBuilder.intoExpression(),
-                           llvm::DILocation::get(CGM.getLLVMContext(), Line,
-                                                 Column, Scope, CurInlinedAt),
-                           Builder.GetInsertBlock());
+  DBuilder.insertDeclare(Storage, D, ExprBuilder.intoExpression(),
+                         llvm::DILocation::get(CGM.getLLVMContext(), Line,
+                                               Column, Scope, CurInlinedAt),
+                         Builder.GetInsertBlock());
   return D;
 }
 
-llvm::DILocalVariable *CGDebugInfo::EmitDef(const VarDecl *VD,
-                                            llvm::Value *Storage,
-                                            std::optional<unsigned> ArgNo,
-                                            CGBuilderTy &Builder,
-                                            const bool UsePointerValue) {
+llvm::DILocalVariable *CGDebugInfo::EmitDeclareForHeterogeneousDwarf(
+    const VarDecl *VD, llvm::Value *Storage, std::optional<unsigned> ArgNo,
+    CGBuilderTy &Builder, const bool UsePointerValue) {
   assert(CGM.getCodeGenOpts().hasReducedDebugInfo() &&
          "Call to EmitDef below ReducedDebugInfo");
   assert(CGM.getCodeGenOpts().isHeterogeneousDwarfEnabled() &&
@@ -5209,10 +5196,7 @@ llvm::DILocalVariable *CGDebugInfo::EmitDef(const VarDecl *VD,
       CGM.getLLVMContext());
 
   llvm::DIExprBuilder ExprBuilder(CGM.getLLVMContext());
-  if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr())
-    ExprBuilder.append<llvm::DIOp::Referrer>(Storage->getType());
-  else
-    ExprBuilder.append<llvm::DIOp::Arg>(0u, Storage->getType());
+  ExprBuilder.append<llvm::DIOp::Arg>(0u, Storage->getType());
   llvm::Type *ReferrerPointeeTy =
       (!Name.empty() && VD->isEscapingByref()) ? BlockPtrTy : VDMemTy;
   if (UsePointerValue)
@@ -5255,12 +5239,7 @@ llvm::DILocalVariable *CGDebugInfo::EmitDef(const VarDecl *VD,
     const RecordDecl *RD = RT->getDecl();
     if (RD->isUnion() && RD->isAnonymousStructOrUnion()) {
       llvm::DIExprBuilder UnionExprBuilder{ExprBuilder};
-      llvm::DIExpr *UnionDIExpr = nullptr;
-      llvm::DIExpression *UnionDIExpression = nullptr;
-      if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr())
-        UnionDIExpr = UnionExprBuilder.intoExpr();
-      else
-        UnionDIExpression = UnionExprBuilder.intoExpression();
+      llvm::DIExpression *UnionDIExpression = UnionExprBuilder.intoExpression();
 
       // GDB has trouble finding local variables in anonymous unions, so we emit
       // artificial local variables for each of the members.
@@ -5284,18 +5263,11 @@ llvm::DILocalVariable *CGDebugInfo::EmitDef(const VarDecl *VD,
             Flags | llvm::DINode::FlagArtificial, MS, FieldAlign);
 
         // Insert an intrinsic into the current block.
-        if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr())
-          DBuilder.insertDef(DBuilder.createBoundedLifetime(D, UnionDIExpr),
-                             Storage,
-                             llvm::DILocation::get(CGM.getLLVMContext(), Line,
-                                                   Column, Scope, CurInlinedAt),
-                             Builder.GetInsertBlock());
-        else
-          DBuilder.insertDeclare(Storage, D, UnionDIExpression,
-                                 llvm::DILocation::get(CGM.getLLVMContext(),
-                                                       Line, Column, Scope,
-                                                       CurInlinedAt),
-                                 Builder.GetInsertBlock());
+        DBuilder.insertDeclare(Storage, D, UnionDIExpression,
+                               llvm::DILocation::get(CGM.getLLVMContext(), Line,
+                                                     Column, Scope,
+                                                     CurInlinedAt),
+                               Builder.GetInsertBlock());
       }
     }
   }
@@ -5355,17 +5327,10 @@ llvm::DILocalVariable *CGDebugInfo::EmitDef(const VarDecl *VD,
                                       Align);
   }
   // Insert an intrinsic into the current block.
-  if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr())
-    DBuilder.insertDef(
-        DBuilder.createBoundedLifetime(D, ExprBuilder.intoExpr()), Storage,
-        llvm::DILocation::get(CGM.getLLVMContext(), Line, Column, Scope,
-                              CurInlinedAt),
-        Builder.GetInsertBlock());
-  else
-    DBuilder.insertDeclare(Storage, D, ExprBuilder.intoExpression(),
-                           llvm::DILocation::get(CGM.getLLVMContext(), Line,
-                                                 Column, Scope, CurInlinedAt),
-                           Builder.GetInsertBlock());
+  DBuilder.insertDeclare(Storage, D, ExprBuilder.intoExpression(),
+                         llvm::DILocation::get(CGM.getLLVMContext(), Line,
+                                               Column, Scope, CurInlinedAt),
+                         Builder.GetInsertBlock());
 
   llvm::Function *Parent = Builder.GetInsertBlock()->getParent();
   assert(Parent->getSubprogram() && "expected DISubprogram");
@@ -5380,7 +5345,8 @@ llvm::DILocalVariable *CGDebugInfo::EmitDeclare(const BindingDecl *BD,
                                                 const bool UsePointerValue) {
 
   if (CGM.getCodeGenOpts().isHeterogeneousDwarfEnabled())
-    return EmitDef(BD, Storage, ArgNo, Builder, UsePointerValue);
+    return EmitDeclareForHeterogeneousDwarf(BD, Storage, ArgNo, Builder,
+                                            UsePointerValue);
 
   assert(CGM.getCodeGenOpts().hasReducedDebugInfo());
   assert(!LexicalBlockStack.empty() && "Region stack mismatch, stack empty!");
@@ -5843,41 +5809,12 @@ llvm::DIGlobalVariableExpression *CGDebugInfo::CollectAnonRecordDecls(
   return GVE;
 }
 
-llvm::DIGlobalVariable *
-CGDebugInfo::CollectAnonRecordDeclsForHeterogeneousDwarfDIExpr(
-    const RecordDecl *RD, llvm::DIFile *Unit, unsigned LineNo,
-    StringRef LinkageName, llvm::dwarf::MemorySpace MS,
-    llvm::GlobalVariable *Var, llvm::DIScope *DContext) {
-  assert(CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr());
-
-  llvm::DIGlobalVariable *GV = nullptr;
-
-  for (const auto *Field : RD->fields()) {
-    llvm::DIType *FieldTy = getOrCreateType(Field->getType(), Unit);
-    StringRef FieldName = Field->getName();
-
-    // Ignore unnamed fields, but recurse into anonymous records.
-    if (FieldName.empty()) {
-      if (const auto *RT = dyn_cast<RecordType>(Field->getType()))
-        GV = CollectAnonRecordDeclsForHeterogeneousDwarfDIExpr(
-            RT->getDecl(), Unit, LineNo, LinkageName, MS, Var, DContext);
-      continue;
-    }
-    // Use VarDecl's Tag, Scope and Line number.
-    GV = DBuilder.createGlobalVariable(DContext, FieldName, LinkageName, Unit,
-                                       LineNo, FieldTy, Var->hasLocalLinkage(),
-                                       MS);
-    Var->addDebugInfo(GV);
-  }
-  return GV;
-}
-
 llvm::DIGlobalVariableExpression *
-CGDebugInfo::CollectAnonRecordDeclsForHeterogeneousDwarfDIExpression(
+CGDebugInfo::CollectAnonRecordDeclsForHeterogeneousDwarf(
     const RecordDecl *RD, llvm::DIFile *Unit, unsigned LineNo,
     StringRef LinkageName, llvm::dwarf::MemorySpace MS,
     llvm::GlobalVariable *Var, llvm::DIScope *DContext) {
-  assert(CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpression());
+  assert(CGM.getCodeGenOpts().isHeterogeneousDwarfEnabled());
 
   llvm::DIGlobalVariableExpression *GVE = nullptr;
 
@@ -5888,7 +5825,7 @@ CGDebugInfo::CollectAnonRecordDeclsForHeterogeneousDwarfDIExpression(
     // Ignore unnamed fields, but recurse into anonymous records.
     if (FieldName.empty()) {
       if (const auto *RT = dyn_cast<RecordType>(Field->getType()))
-        GVE = CollectAnonRecordDeclsForHeterogeneousDwarfDIExpression(
+        GVE = CollectAnonRecordDeclsForHeterogeneousDwarf(
             RT->getDecl(), Unit, LineNo, LinkageName, MS, Var, DContext);
       continue;
     }
@@ -6245,7 +6182,6 @@ void CGDebugInfo::EmitGlobalVariableForHeterogeneousDwarf(
 
   // Attempt to store one global variable for the declaration - even if we
   // emit a lot of fields.
-  llvm::DIGlobalVariable *DGV = nullptr;
   llvm::DIGlobalVariableExpression *GVE = nullptr;
 
   // If this is an anonymous union then we'll want to emit a global
@@ -6257,12 +6193,8 @@ void CGDebugInfo::EmitGlobalVariableForHeterogeneousDwarf(
     assert(RD->isAnonymousStructOrUnion() &&
            "unnamed non-anonymous struct or union?");
     // FIXME(KZHURAVL): No tests for this path.
-    if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr())
-      DGV = CollectAnonRecordDeclsForHeterogeneousDwarfDIExpr(
-          RD, Unit, LineNo, LinkageName, MS, Var, DContext);
-    else
-      GVE = CollectAnonRecordDeclsForHeterogeneousDwarfDIExpression(
-          RD, Unit, LineNo, LinkageName, MS, Var, DContext);
+    GVE = CollectAnonRecordDeclsForHeterogeneousDwarf(
+        RD, Unit, LineNo, LinkageName, MS, Var, DContext);
   } else {
     auto Align = getDeclAlignIfRequired(D, CGM.getContext());
 
@@ -6273,38 +6205,14 @@ void CGDebugInfo::EmitGlobalVariableForHeterogeneousDwarf(
 
     llvm::DINodeArray Annotations = CollectBTFDeclTagAnnotations(D);
 
-    if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr()) {
-      DGV = DBuilder.createGlobalVariable(
-          DContext, DeclName, LinkageName, Unit, LineNo,
-          getOrCreateType(T, Unit), Var->hasLocalLinkage(), true,
-          getOrCreateStaticDataMemberDeclarationOrNull(D), TemplateParameters,
-          MS, getDeclAlignIfRequired(D, CGM.getContext()));
-
-      // Create DIFragment.
-      llvm::DIFragment *Fragment = DBuilder.createFragment();
-      SmallVector<llvm::Metadata *> LifetimeArgs;
-      LifetimeArgs.push_back(Fragment);
-
-      // Create DILifetime and add to llvm.dbg.retainedNodes named metadata.
-      DBuilder.createComputedLifetime(DGV, ExprBuilder.intoExpr(),
-                                      LifetimeArgs);
-
-      Var->setDbgDef(Fragment);
-
-    } else {
-      GVE = DBuilder.createGlobalVariableExpression(
-          DContext, DeclName, LinkageName, Unit, LineNo,
-          getOrCreateType(T, Unit), Var->hasLocalLinkage(), true,
-          ExprBuilder.intoExpression(),
-          getOrCreateStaticDataMemberDeclarationOrNull(D), TemplateParameters,
-          MS, Align, Annotations);
-      Var->addDebugInfo(GVE);
-    }
+    GVE = DBuilder.createGlobalVariableExpression(
+        DContext, DeclName, LinkageName, Unit, LineNo, getOrCreateType(T, Unit),
+        Var->hasLocalLinkage(), true, ExprBuilder.intoExpression(),
+        getOrCreateStaticDataMemberDeclarationOrNull(D), TemplateParameters, MS,
+        Align, Annotations);
+    Var->addDebugInfo(GVE);
   }
-  if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr())
-    GV.reset(DGV);
-  else
-    DeclCache[D->getCanonicalDecl()].reset(GVE);
+  DeclCache[D->getCanonicalDecl()].reset(GVE);
 }
 
 void CGDebugInfo::EmitGlobalVariable(const ValueDecl *VD, const APValue &Init) {
@@ -6468,22 +6376,11 @@ void CGDebugInfo::EmitGlobalVariableForHeterogeneousDwarf(
     ExprBuilder.append<llvm::DIOp::Constant>(
         llvm::ConstantFP::get(CGM.getLLVMContext(), Init.getFloat()));
 
-  if (CGM.getCodeGenOpts().isHeterogeneousDwarfDIExpr()) {
-    llvm::DIGlobalVariable *DGV = DBuilder.createGlobalVariable(
-        DContext, Name, StringRef(), Unit, getLineNumber(VD->getLocation()), Ty,
-        true, true, getOrCreateStaticDataMemberDeclarationOrNull(VarD),
-        TemplateParameters, MS, Align);
-
-    DBuilder.createComputedLifetime(DGV, ExprBuilder.intoExpr(), {});
-
-    GV.reset(DGV);
-  } else {
-    GV.reset(DBuilder.createGlobalVariableExpression(
-        DContext, Name, StringRef(), Unit, getLineNumber(VD->getLocation()), Ty,
-        true, true, ExprBuilder.intoExpression(),
-        getOrCreateStaticDataMemberDeclarationOrNull(VarD), TemplateParameters,
-        MS, Align));
-  }
+  GV.reset(DBuilder.createGlobalVariableExpression(
+      DContext, Name, StringRef(), Unit, getLineNumber(VD->getLocation()), Ty,
+      true, true, ExprBuilder.intoExpression(),
+      getOrCreateStaticDataMemberDeclarationOrNull(VarD), TemplateParameters,
+      MS, Align));
 }
 
 void CGDebugInfo::EmitExternalVariable(llvm::GlobalVariable *Var,

clang/lib/CodeGen/CGDebugInfo.h

@@ -660,21 +660,19 @@ class CGDebugInfo {
                                      CGBuilderTy &Builder,
                                      const bool UsePointerValue = false);
 
-  /// Emit call to llvm.dbg.def for a variable definition.
+  /// Emit call to llvm.dbg.declare for a variable definition.
   /// Returns a pointer to the DILocalVariable associated with the
   /// llvm.dbg.def, or nullptr otherwise.
-  llvm::DILocalVariable *EmitDef(const VarDecl *decl, llvm::Value *AI,
-                                 std::optional<unsigned> ArgNo,
-                                 CGBuilderTy &Builder,
-                                 const bool UsePointerValue = false);
+  llvm::DILocalVariable *EmitDeclareForHeterogeneousDwarf(
+      const VarDecl *decl, llvm::Value *AI, std::optional<unsigned> ArgNo,
+      CGBuilderTy &Builder, const bool UsePointerValue = false);
 
-  /// Emit call to llvm.dbg.def for a structured binding definition.
+  /// Emit call to llvm.dbg.declare for a structured binding definition.
   /// Returns a pointer to the DILocalVariable associated with the
   /// llvm.dbg.def, or nullptr otherwise.
-  llvm::DILocalVariable *EmitDef(const BindingDecl *decl, llvm::Value *AI,
-                                 std::optional<unsigned> ArgNo,
-                                 CGBuilderTy &Builder,
-                                 const bool UsePointerValue = false);
+  llvm::DILocalVariable *EmitDeclareForHeterogeneousDwarf(
+      const BindingDecl *decl, llvm::Value *AI, std::optional<unsigned> ArgNo,
+      CGBuilderTy &Builder, const bool UsePointerValue = false);
 
   /// Emit call to llvm.dbg.declare for a binding declaration.
   /// Returns a pointer to the DILocalVariable associated with the
@@ -819,20 +817,7 @@ class CGDebugInfo {
   /// anonymous decl and create static variables for them. The first
   /// time this is called it needs to be on a union and then from
   /// there we can have additional unnamed fields.
-  llvm::DIGlobalVariable *CollectAnonRecordDeclsForHeterogeneousDwarfDIExpr(
-      const RecordDecl *RD, llvm::DIFile *Unit, unsigned LineNo,
-      StringRef LinkageName, llvm::dwarf::MemorySpace MS,
-      llvm::GlobalVariable *Var, llvm::DIScope *DContext);
-
-  /// Return a global variable that represents one of the collection of global
-  /// variables created for an anonmyous union (-gheterogeneous-dwarf).
-  ///
-  /// Recursively collect all of the member fields of a global
-  /// anonymous decl and create static variables for them. The first
-  /// time this is called it needs to be on a union and then from
-  /// there we can have additional unnamed fields.
-  llvm::DIGlobalVariableExpression *
-  CollectAnonRecordDeclsForHeterogeneousDwarfDIExpression(
+  llvm::DIGlobalVariableExpression *CollectAnonRecordDeclsForHeterogeneousDwarf(
       const RecordDecl *RD, llvm::DIFile *Unit, unsigned LineNo,
       StringRef LinkageName, llvm::dwarf::MemorySpace MS,
       llvm::GlobalVariable *Var, llvm::DIScope *DContext);