[PATCH] D59301: [DebugInfo] Remove redundant DebugLocEntry::MergeValues() function, NFC

[David Stenberg via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL357974: [DebugInfo] Remove redundant DebugLocEntry::MergeValues() function, NFC (authored by dstenb, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D59301?vs=190426&id=194258#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D59301/new/

https://reviews.llvm.org/D59301

Files:
  llvm/trunk/lib/CodeGen/AsmPrinter/DebugLocEntry.h
  llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp


Index: llvm/trunk/lib/CodeGen/AsmPrinter/DebugLocEntry.h
===================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DebugLocEntry.h
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DebugLocEntry.h
@@ -105,12 +105,6 @@
     Values.push_back(std::move(Val));
   }
 
-  /// If this and Next are describing different pieces of the same
-  /// variable, merge them by appending Next's values to the current
-  /// list of values.
-  /// Return true if the merge was successful.
-  bool MergeValues(const DebugLocEntry &Next);
-
   /// Attempt to merge this DebugLocEntry with Next and return
   /// true if the merge was successful. Entries can be merged if they
   /// share the same Loc/Constant and if Next immediately follows this
Index: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
===================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -1094,42 +1094,6 @@
   llvm_unreachable("Unexpected 4-operand DBG_VALUE instruction!");
 }
 
-/// If this and Next are describing different fragments of the same
-/// variable, merge them by appending Next's values to the current
-/// list of values.
-/// Return true if the merge was successful.
-bool DebugLocEntry::MergeValues(const DebugLocEntry &Next) {
-  if (Begin == Next.Begin) {
-    auto *FirstExpr = cast<DIExpression>(Values[0].Expression);
-    auto *FirstNextExpr = cast<DIExpression>(Next.Values[0].Expression);
-    if (!FirstExpr->isFragment() || !FirstNextExpr->isFragment())
-      return false;
-
-    // We can only merge entries if none of the fragments overlap any others.
-    // In doing so, we can take advantage of the fact that both lists are
-    // sorted.
-    for (unsigned i = 0, j = 0; i < Values.size(); ++i) {
-      for (; j < Next.Values.size(); ++j) {
-        int res = cast<DIExpression>(Values[i].Expression)->fragmentCmp(
-            cast<DIExpression>(Next.Values[j].Expression));
-        if (res == 0) // The two expressions overlap, we can't merge.
-          return false;
-        // Values[i] is entirely before Next.Values[j],
-        // so go back to the next entry of Values.
-        else if (res == -1)
-          break;
-        // Next.Values[j] is entirely before Values[i], so go on to the
-        // next entry of Next.Values.
-      }
-    }
-
-    addValues(Next.Values);
-    End = Next.End;
-    return true;
-  }
-  return false;
-}
-
 /// Build the location list for all DBG_VALUEs in the function that
 /// describe the same variable.  If the ranges of several independent
 /// fragments of the same variable overlap partially, split them up and
@@ -1205,27 +1169,17 @@
     }
 
     DebugLocEntry Loc(StartLabel, EndLabel, Value);
-    bool couldMerge = false;
 
-    // If this is a fragment, it may belong to the current DebugLocEntry.
     if (DIExpr->isFragment()) {
       // Add this value to the list of open ranges.
       OpenRanges.push_back(Value);
-
-      // Attempt to add the fragment to the last entry.
-      if (!DebugLoc.empty())
-        if (DebugLoc.back().MergeValues(Loc))
-          couldMerge = true;
     }
 
-    if (!couldMerge) {
-      // Need to add a new DebugLocEntry. Add all values from still
-      // valid non-overlapping fragments.
-      if (OpenRanges.size())
-        Loc.addValues(OpenRanges);
+    // Add all values from still valid non-overlapping fragments.
+    if (OpenRanges.size())
+      Loc.addValues(OpenRanges);
 
-      DebugLoc.push_back(std::move(Loc));
-    }
+    DebugLoc.push_back(std::move(Loc));
 
     // Attempt to coalesce the ranges of two otherwise identical
     // DebugLocEntries.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59301.194258.patch
Type: text/x-patch
Size: 3723 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190409/adebf05f/attachment.bin>