Address comments.

Author: kazutakahirata

llvm/include/llvm/Transforms/Instrumentation/MemProfiler.h

@@ -62,9 +62,6 @@ namespace memprof {
 struct LineLocation {
   LineLocation(uint32_t L, uint32_t D) : LineOffset(L), Column(D) {}
 
-  void print(raw_ostream &OS) const;
-  void dump() const;
-
   bool operator<(const LineLocation &O) const {
     return LineOffset < O.LineOffset ||
            (LineOffset == O.LineOffset && Column < O.Column);

llvm/lib/Transforms/Instrumentation/MemProfiler.cpp

@@ -833,10 +833,9 @@ memprof::extractCallsFromIR(Module &M) {
   }
 
   // Sort each call list by the source location.
-  for (auto &KV : Calls) {
-    auto &Calls = KV.second;
-    llvm::sort(Calls);
-    Calls.erase(llvm::unique(Calls), Calls.end());
+  for (auto &[CallerGUID, CallList] : Calls) {
+    llvm::sort(CallList);
+    CallList.erase(llvm::unique(CallList), CallList.end());
   }
 
   return Calls;

llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp

@@ -90,19 +90,14 @@ declare !dbg !19 void @_Z2f3v()
 
   // Verify that call sites show up in the ascending order of their source
   // locations.
-  EXPECT_EQ(CallSites[0].first.LineOffset, 1U);
-  EXPECT_EQ(CallSites[0].first.Column, 3U);
-  EXPECT_EQ(CallSites[0].second,
-            memprof::IndexedMemProfRecord::getGUID("_Z2f1v"));
-
-  EXPECT_EQ(CallSites[1].first.LineOffset, 2U);
-  EXPECT_EQ(CallSites[1].first.Column, 3U);
-  EXPECT_EQ(CallSites[1].second,
-            memprof::IndexedMemProfRecord::getGUID("_Z2f2v"));
-
-  EXPECT_EQ(CallSites[2].first.LineOffset, 2U);
-  EXPECT_EQ(CallSites[2].first.Column, 9U);
-  EXPECT_EQ(CallSites[2].second,
-            memprof::IndexedMemProfRecord::getGUID("_Z2f3v"));
+  EXPECT_THAT(CallSites[0],
+              testing::Pair(testing::FieldsAre(1U, 3U),
+                            memprof::IndexedMemProfRecord::getGUID("_Z2f1v")));
+  EXPECT_THAT(CallSites[1],
+              testing::Pair(testing::FieldsAre(2U, 3U),
+                            memprof::IndexedMemProfRecord::getGUID("_Z2f2v")));
+  EXPECT_THAT(CallSites[2],
+              testing::Pair(testing::FieldsAre(2U, 9U),
+                            memprof::IndexedMemProfRecord::getGUID("_Z2f3v")));
 }
 } // namespace