summaryrefslogtreecommitdiff
path: root/llvm/lib/Remarks/RemarkLinker.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/Remarks/RemarkLinker.cpp')
-rw-r--r--llvm/lib/Remarks/RemarkLinker.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/llvm/lib/Remarks/RemarkLinker.cpp b/llvm/lib/Remarks/RemarkLinker.cpp
index b70b06d706bd..0ca6217edfdd 100644
--- a/llvm/lib/Remarks/RemarkLinker.cpp
+++ b/llvm/lib/Remarks/RemarkLinker.cpp
@@ -66,17 +66,10 @@ void RemarkLinker::setExternalFilePrependPath(StringRef PrependPathIn) {
PrependPath = std::string(PrependPathIn);
}
-Error RemarkLinker::link(StringRef Buffer, std::optional<Format> RemarkFormat) {
- if (!RemarkFormat) {
- Expected<Format> ParserFormat = magicToFormat(Buffer);
- if (!ParserFormat)
- return ParserFormat.takeError();
- RemarkFormat = *ParserFormat;
- }
-
+Error RemarkLinker::link(StringRef Buffer, Format RemarkFormat) {
Expected<std::unique_ptr<RemarkParser>> MaybeParser =
createRemarkParserFromMeta(
- *RemarkFormat, Buffer, /*StrTab=*/std::nullopt,
+ RemarkFormat, Buffer,
PrependPath ? std::optional<StringRef>(StringRef(*PrependPath))
: std::optional<StringRef>());
if (!MaybeParser)
@@ -102,8 +95,7 @@ Error RemarkLinker::link(StringRef Buffer, std::optional<Format> RemarkFormat) {
return Error::success();
}
-Error RemarkLinker::link(const object::ObjectFile &Obj,
- std::optional<Format> RemarkFormat) {
+Error RemarkLinker::link(const object::ObjectFile &Obj, Format RemarkFormat) {
Expected<std::optional<StringRef>> SectionOrErr =
getRemarksSectionContents(Obj);
if (!SectionOrErr)