Remove BranchFolding specialization, stacktrace->stack trace

Author: SLTozer

llvm/include/llvm/IR/DebugLoc.h

@@ -74,8 +74,8 @@ namespace llvm {
   // allowing Debugify to ignore intentionally-empty DebugLocs and display the
   // code responsible for generating unintentionally-empty DebugLocs.
   // Currently we only need to track the Origin of this DILoc when using a
-  // DebugLoc that is Normal and empty, so only collect the origin stacktrace in
-  // those cases.
+  // DebugLoc that is not annotated (i.e. has DebugLocKind::Normal) and has a
+  // null DILocation, so only collect the origin stacktrace in those cases.
   class DILocAndCoverageTracking : public TrackingMDNodeRef,
                                    public DbgLocOrigin {
   public:

llvm/include/llvm/Support/Signals.h

@@ -25,7 +25,7 @@ class StringRef;
 class raw_ostream;
 
 #if ENABLE_DEBUGLOC_ORIGIN_TRACKING
-// Typedefs that are convenient but only used by the StackTrace-collection code
+// Typedefs that are convenient but only used by the stack-trace-collection code
 // added if DebugLoc origin-tracking is enabled.
 template <typename T, typename Enable> struct DenseMapInfo;
 template <typename ValueT, typename ValueInfoT> class DenseSet;
@@ -79,7 +79,7 @@ LLVM_ABI void PrintStackTrace(raw_ostream &OS, int Depth = 0);
 #ifdef NDEBUG
 #error DebugLoc origin-tracking should not be enabled in Release builds.
 #endif
-  /// Populates the given array with a stacktrace of the current program, up to
+  /// Populates the given array with a stack trace of the current program, up to
   /// MaxDepth frames. Returns the number of frames returned, which will be
   /// inserted into \p StackTrace from index 0. All entries after the returned
   /// depth will be unmodified. NB: This is only intended to be used for

llvm/lib/CodeGen/BranchFolding.cpp

@@ -42,6 +42,7 @@
 #include "llvm/CodeGen/TargetPassConfig.h"
 #include "llvm/CodeGen/TargetRegisterInfo.h"
 #include "llvm/CodeGen/TargetSubtargetInfo.h"
+#include "llvm/Config/config.h"
 #include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/IR/DebugLoc.h"
 #include "llvm/IR/Function.h"
@@ -933,12 +934,18 @@ bool BranchFolder::TryTailMergeBlocks(MachineBasicBlock *SuccBB,
 
   // Sort by hash value so that blocks with identical end sequences sort
   // together.
+#if ENABLE_DEBUGLOC_ORIGIN_TRACKING
+  // If origin-tracking is enabled then MergePotentialElt is no longer a POD
+  // type, so we need std::sort instead.
+  std::sort(MergePotentials.begin(), MergePotentials.end());
+#else
   array_pod_sort(MergePotentials.begin(), MergePotentials.end());
+#endif
 
   // Walk through equivalence sets looking for actual exact matches.
   while (MergePotentials.size() > 1) {
     unsigned CurHash = MergePotentials.back().getHash();
-    const DebugLoc BranchDL = MergePotentials.back().getBranchDebugLoc();
+    const DebugLoc &BranchDL = MergePotentials.back().getBranchDebugLoc();
 
     // Build SameTails, identifying the set of blocks with this hash code
     // and with the maximum number of instructions in common.

llvm/lib/CodeGen/BranchFolding.h

@@ -50,15 +50,11 @@ class TargetRegisterInfo;
     class MergePotentialsElt {
       unsigned Hash;
       MachineBasicBlock *Block;
-      // We use MDNode rather than DebugLoc here because under certain CMake
-      // options*, DebugLoc may contain a SmallVector used for introspection
-      // purposes, which causes errors when stored here.
-      // *LLVM_ENABLE_DEBUGLOC_COVERAGE_TRACKING=COVERAGE_AND_ORIGIN
-      MDNode *BranchDebugLoc;
+      DebugLoc BranchDebugLoc;
 
     public:
-      MergePotentialsElt(unsigned h, MachineBasicBlock *b, MDNode *bdl)
-          : Hash(h), Block(b), BranchDebugLoc(bdl) {}
+      MergePotentialsElt(unsigned h, MachineBasicBlock *b, DebugLoc bdl)
+          : Hash(h), Block(b), BranchDebugLoc(std::move(bdl)) {}
 
       unsigned getHash() const { return Hash; }
       MachineBasicBlock *getBlock() const { return Block; }
@@ -67,7 +63,7 @@ class TargetRegisterInfo;
         Block = MBB;
       }
 
-      const DebugLoc getBranchDebugLoc() { return DebugLoc(BranchDebugLoc); }
+      const DebugLoc &getBranchDebugLoc() { return BranchDebugLoc; }
 
       bool operator<(const MergePotentialsElt &) const;
     };