Fix merge conflicts after syncing to head

- Add missing extern declarations for MemProf command line options
- Remove duplicate function definition that conflicts with MemoryProfileInfo

Author: Snehasish Kumar

graphite_command_reference.md

@@ -1,5 +1,5 @@
 //===- MemProfInstrumentation.cpp - memory allocation and access profiler
-//instrumentation ------------===//
+// instrumentation ------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

llvm/lib/Transforms/Instrumentation/MemProfInstrumentation.cpp

@@ -43,6 +43,9 @@ namespace llvm {
 extern cl::opt<bool> PGOWarnMissing;
 extern cl::opt<bool> NoPGOWarnMismatch;
 extern cl::opt<bool> NoPGOWarnMismatchComdatWeak;
+extern cl::opt<bool> MemProfReportHintedSizes;
+extern cl::opt<unsigned> MinClonedColdBytePercent;
+extern cl::opt<unsigned> MinCallsiteColdBytePercent;
 } // namespace llvm
 
 // By default disable matching of allocation profiles onto operator new that
@@ -91,14 +94,6 @@ STATISTIC(NumOfMemProfMatchedAllocs,
 STATISTIC(NumOfMemProfMatchedCallSites,
           "Number of matched memory profile callsites.");
 
-// Options under which we need to record the context size info in the alloc trie
-// used to build metadata.
-bool recordContextSizeInfo() {
-  return MemProfReportHintedSizes || MinClonedColdBytePercent < 100 ||
-         MinCallsiteColdBytePercent < 100;
-
-}
-
 static void addCallsiteMetadata(Instruction &I,
                                 ArrayRef<uint64_t> InlinedCallStack,
                                 LLVMContext &Ctx) {