Address review comments, cleanup more remnants

Author: slinder1

clang/lib/CodeGen/CodeGenModule.cpp

@@ -1054,13 +1054,12 @@ void CodeGenModule::Release() {
                               "StrictVTablePointersRequirement",
                               llvm::MDNode::get(VMContext, Ops));
   }
-  if (getModuleDebugInfo()) {
+  if (getModuleDebugInfo())
     // We support a single version in the linked module. The LLVM
     // parser will drop debug info with a different version number
     // (and warn about it, too).
     getModule().addModuleFlag(llvm::Module::Warning, "Debug Info Version",
                               llvm::DEBUG_METADATA_VERSION);
-  }
 
   // We need to record the widths of enums and wchar_t, so that we can generate
   // the correct build attributes in the ARM backend. wchar_size is also used by

llvm/include/llvm/CodeGen/DbgEntityHistoryCalculator.h

@@ -20,7 +20,6 @@ namespace llvm {
 class DILocation;
 class LexicalScopes;
 class DINode;
-class MachineBasicBlock;
 class MachineFunction;
 class TargetRegisterInfo;
 

llvm/include/llvm/CodeGen/SelectionDAG.h

@@ -83,7 +83,6 @@ class ProfileSummaryInfo;
 class SDDbgValue;
 class SDDbgOperand;
 class SDDbgLabel;
-class SDDbgKill;
 class SelectionDAG;
 class SelectionDAGTargetInfo;
 class TargetLibraryInfo;

llvm/include/llvm/CodeGen/TargetFrameLowering.h

@@ -15,14 +15,14 @@
 
 #include "llvm/ADT/BitVector.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
-#include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/CodeGen/MachineOptimizationRemarkEmitter.h"
 #include "llvm/Support/TypeSize.h"
 #include <vector>
 
 namespace llvm {
   class BitVector;
   class CalleeSavedInfo;
+  class DIExpression;
   class MachineFunction;
   class RegScavenger;
 

llvm/include/llvm/IR/DIBuilder.h

@@ -752,11 +752,6 @@ namespace llvm {
                                DIGenericSubrange::BoundType UpperBound,
                                DIGenericSubrange::BoundType Stride);
 
-    /// Create fragment, which represents the identity of a location
-    /// description that can be used as the piece of another location
-    /// description.
-    DIFragment *createFragment();
-
     /// Create a new descriptor for the specified variable.
     /// \param Context       Variable scope.
     /// \param Name          Name of the variable.

llvm/lib/CodeGen/RegAllocFast.cpp

@@ -338,7 +338,6 @@ class RegAllocFastImpl {
 
   void allocateInstruction(MachineInstr &MI);
   void handleDebugValue(MachineInstr &MI);
-  void killDebugDefWithinBlock(MachineInstr &MI);
   void handleBundle(MachineInstr &MI);
 
   bool usePhysReg(MachineInstr &MI, MCRegister PhysReg);

llvm/lib/IR/AutoUpgrade.cpp

@@ -5008,8 +5008,7 @@ bool llvm::UpgradeDebugInfo(Module &M) {
     }
   }
 
-  bool VersionSupported = Version == DEBUG_METADATA_VERSION ||
-                          Version == DEBUG_METADATA_VERSION_HETEROGENEOUS_DWARF;
+  bool VersionSupported = Version == DEBUG_METADATA_VERSION;
   if (VersionSupported) {
     bool BrokenDebugInfo = false;
     if (verifyModule(M, &llvm::errs(), &BrokenDebugInfo))

llvm/lib/IR/DIBuilder.cpp

@@ -765,10 +765,6 @@ DIGenericSubrange *DIBuilder::getOrCreateGenericSubrange(
                                 ConvToMetadata(Stride));
 }
 
-DIFragment *DIBuilder::createFragment() {
-  return DIFragment::getDistinct(VMContext);
-}
-
 DISubrangeType *DIBuilder::createSubrangeType(
     StringRef Name, DIFile *File, unsigned LineNo, DIScope *Scope,
     uint64_t SizeInBits, uint32_t AlignInBits, DINode::DIFlags Flags,

llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp

@@ -1317,12 +1317,6 @@ class AMDGPULowerModuleLDS {
 
     performOptimizedStructLayout(LayoutFields);
 
-    struct DIExprVarInfo {
-      GlobalVariable *Var;
-      uint64_t Offset;
-    };
-    DenseMap<DIFragment *, DIExprVarInfo> Fragment2VarInfo;
-
     struct DIExpressionVarInfo {
       GlobalVariable *Var;
       Metadata *DIVar;

llvm/test/CodeGen/Generic/llvm.dbg.def_kill-dag-isel.ll

@@ -1,6 +1,6 @@
-; RUN: not --crash llc -O0 -march=amdgcn -stop-after=finalize-isel < %s 2>&1 | FileCheck %s
+; RUN: llc -O0 -march=amdgcn -stop-after=finalize-isel < %s 2>&1 | FileCheck %s
 
-; CHECK: LLVM ERROR: unsupported DIExpr-based metadata
+; CHECK: warning: ignoring debug info with an invalid version (4) in <stdin>
 
 target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5-G1-ni:7"
 target triple = "amdgcn-amd-amdhsa"