diff --git a/bolt/lib/Rewrite/PseudoProbeRewriter.cpp b/bolt/lib/Rewrite/PseudoProbeRewriter.cpp index 8647df4b0edf8..09aa4fbb66bd4 100644 --- a/bolt/lib/Rewrite/PseudoProbeRewriter.cpp +++ b/bolt/lib/Rewrite/PseudoProbeRewriter.cpp @@ -127,8 +127,8 @@ void PseudoProbeRewriter::parsePseudoProbe(bool ProfiledOnly) { StringRef Contents = PseudoProbeDescSection->getContents(); if (!ProbeDecoder.buildGUID2FuncDescMap( - reinterpret_cast(Contents.data()), - Contents.size())) { + reinterpret_cast(Contents.data()), Contents.size(), + /*IsMMapped*/ true)) { errs() << "BOLT-WARNING: fail in building GUID2FuncDescMap\n"; return; } diff --git a/llvm/include/llvm/MC/MCPseudoProbe.h b/llvm/include/llvm/MC/MCPseudoProbe.h index 4bfae9eba1a0a..fd1f055789544 100644 --- a/llvm/include/llvm/MC/MCPseudoProbe.h +++ b/llvm/include/llvm/MC/MCPseudoProbe.h @@ -431,7 +431,10 @@ class MCPseudoProbeDecoder { using Uint64Map = DenseMap; // Decode pseudo_probe_desc section to build GUID to PseudoProbeFuncDesc map. - bool buildGUID2FuncDescMap(const uint8_t *Start, std::size_t Size); + // If pseudo_probe_desc section is mapped to memory and \p IsMMapped is true, + // uses StringRefs pointing to the section. + bool buildGUID2FuncDescMap(const uint8_t *Start, std::size_t Size, + bool IsMMapped = false); // Decode pseudo_probe section to count the number of probes and inlined // function records for each function record. diff --git a/llvm/lib/MC/MCPseudoProbe.cpp b/llvm/lib/MC/MCPseudoProbe.cpp index 90d7588407068..2a3761b2cfe71 100644 --- a/llvm/lib/MC/MCPseudoProbe.cpp +++ b/llvm/lib/MC/MCPseudoProbe.cpp @@ -375,7 +375,8 @@ ErrorOr MCPseudoProbeDecoder::readString(uint32_t Size) { } bool MCPseudoProbeDecoder::buildGUID2FuncDescMap(const uint8_t *Start, - std::size_t Size) { + std::size_t Size, + bool IsMMapped) { // The pseudo_probe_desc section has a format like: // .section .pseudo_probe_desc,"",@progbits // .quad -5182264717993193164 // GUID @@ -422,7 +423,8 @@ bool MCPseudoProbeDecoder::buildGUID2FuncDescMap(const uint8_t *Start, StringRef Name = cantFail(errorOrToExpected(readString(NameSize))); // Initialize PseudoProbeFuncDesc and populate it into GUID2FuncDescMap - GUID2FuncDescMap.emplace_back(GUID, Hash, Name.copy(FuncNameAllocator)); + GUID2FuncDescMap.emplace_back( + GUID, Hash, IsMMapped ? Name : Name.copy(FuncNameAllocator)); } assert(Data == End && "Have unprocessed data in pseudo_probe_desc section"); assert(GUID2FuncDescMap.size() == FuncDescCount &&