From f66afa3cae35a18a4f8f2eacfe4bc21ef83b2987 Mon Sep 17 00:00:00 2001 From: Alessandro Di Federico Date: Fri, 20 Sep 2024 17:30:28 +0200 Subject: [PATCH] s/deserialize/fromString/g --- .../ControlFlowGraphCache.h | 2 +- include/revng/Pipeline/Global.h | 16 ++++++++-------- include/revng/Pipeline/GlobalsMap.h | 2 +- include/revng/Pipeline/Invokable.h | 4 ++-- include/revng/Pipeline/Location.h | 4 ++-- include/revng/Pipes/ModelGlobal.h | 2 +- include/revng/Pipes/TupleTreeContainer.h | 2 +- include/revng/Support/YAMLTraits.h | 10 +++++----- include/revng/TupleTree/TupleTree.h | 8 ++++---- include/revng/TupleTree/TupleTreeDiff.h | 4 ++-- lib/Model/LoadModelPass.cpp | 2 +- lib/Pipeline/Global.cpp | 3 ++- lib/Pipeline/Step.cpp | 2 +- lib/Pipes/GlobalsAnalyses.cpp | 2 +- lib/Yield/Pipes/AssemblyPipes.cpp | 2 +- lib/Yield/Pipes/CFGPipes.cpp | 2 +- lib/Yield/Pipes/CallGraphPipes.cpp | 2 +- .../revng-check-compatibility-with-abi/Main.cpp | 2 +- tests/unit/Model.cpp | 2 +- tests/unit/ModelType.cpp | 2 +- tools/model/apply/Main.cpp | 2 +- tools/pipeline/Main.cpp | 2 +- 22 files changed, 40 insertions(+), 39 deletions(-) diff --git a/include/revng/EarlyFunctionAnalysis/ControlFlowGraphCache.h b/include/revng/EarlyFunctionAnalysis/ControlFlowGraphCache.h index b18cfedde..507b6c009 100644 --- a/include/revng/EarlyFunctionAnalysis/ControlFlowGraphCache.h +++ b/include/revng/EarlyFunctionAnalysis/ControlFlowGraphCache.h @@ -80,7 +80,7 @@ public: return *It->second.get(); TupleTree &Result = Deserialized[Address]; - Result = TupleTree::deserialize(CFGs.at(Address)) + Result = TupleTree::fromString(CFGs.at(Address)) .get(); return *Result.get(); } diff --git a/include/revng/Pipeline/Global.h b/include/revng/Pipeline/Global.h index 206f6d7d4..059bceb06 100644 --- a/include/revng/Pipeline/Global.h +++ b/include/revng/Pipeline/Global.h @@ -46,9 +46,9 @@ public: virtual llvm::Error applyDiff(const GlobalTupleTreeDiff &Diff) = 0; virtual llvm::Error serialize(llvm::raw_ostream &OS) const = 0; - virtual llvm::Error deserialize(const llvm::MemoryBuffer &Buffer) = 0; + virtual llvm::Error fromString(llvm::StringRef String) = 0; virtual llvm::Expected - deserializeDiff(const llvm::MemoryBuffer &Diff) = 0; + diffFromString(llvm::StringRef String) = 0; virtual bool verify() const = 0; virtual void clear() = 0; @@ -102,7 +102,7 @@ public: llvm::Expected> createNew(llvm::StringRef Name, const llvm::MemoryBuffer &Buffer) const override { - auto MaybeTree = TupleTree::deserialize(Buffer.getBuffer()); + auto MaybeTree = TupleTree::fromString(Buffer.getBuffer()); if (!MaybeTree) return llvm::errorCodeToError(MaybeTree.getError()); return std::make_unique(Name, MaybeTree.get()); @@ -123,8 +123,8 @@ public: return llvm::Error::success(); } - llvm::Error deserialize(const llvm::MemoryBuffer &Buffer) override { - auto MaybeTupleTree = TupleTree::deserialize(Buffer.getBuffer()); + llvm::Error fromString(llvm::StringRef String) override { + auto MaybeTupleTree = TupleTree::fromString(String); if (!MaybeTupleTree) return llvm::errorCodeToError(MaybeTupleTree.getError()); @@ -139,8 +139,8 @@ public: } llvm::Expected - deserializeDiff(const llvm::MemoryBuffer &Buffer) override { - auto MaybeDiff = ::deserialize>(Buffer.getBuffer()); + diffFromString(llvm::StringRef String) override { + auto MaybeDiff = ::fromString>(String); if (not MaybeDiff) return MaybeDiff.takeError(); return GlobalTupleTreeDiff(std::move(*MaybeDiff), getName()); @@ -155,7 +155,7 @@ public: } llvm::Error applyDiff(const llvm::MemoryBuffer &Diff) override { - auto MaybeDiff = TupleTreeDiff::deserialize(Diff.getBuffer()); + auto MaybeDiff = TupleTreeDiff::fromString(Diff.getBuffer()); if (not MaybeDiff) { return MaybeDiff.takeError(); } diff --git a/include/revng/Pipeline/GlobalsMap.h b/include/revng/Pipeline/GlobalsMap.h index 50a6fbfb2..5d252acb1 100644 --- a/include/revng/Pipeline/GlobalsMap.h +++ b/include/revng/Pipeline/GlobalsMap.h @@ -97,7 +97,7 @@ public: auto MaybeGlobal = get(GlobalName); if (!MaybeGlobal) return MaybeGlobal.takeError(); - return MaybeGlobal.get()->deserialize(Buffer); + return MaybeGlobal.get()->fromString(Buffer.getBuffer()); } llvm::Error verify(llvm::StringRef GlobalName) const { diff --git a/include/revng/Pipeline/Invokable.h b/include/revng/Pipeline/Invokable.h index 1a854c87f..0ac5056d9 100644 --- a/include/revng/Pipeline/Invokable.h +++ b/include/revng/Pipeline/Invokable.h @@ -98,7 +98,7 @@ auto &getContainer(const ContainerSet &Containers, llvm::StringRef Name) { template requires PipelineOptionType> -OptionType deserializeImpl(llvm::StringRef Value) { +OptionType fromStringImpl(llvm::StringRef Value) { using ReturnType = OptionType; if constexpr (std::is_same_v) { @@ -117,7 +117,7 @@ OptionType getOption(const llvm::StringMap &Map) { std::string Name = (StringRef(T::Name) + "-" + getOptionName()).str(); if (auto Iter = Map.find(Name); Iter != Map.end()) { - return deserializeImpl(Iter->second); + return fromStringImpl(Iter->second); } // Handle --$OPTION-path flag diff --git a/include/revng/Pipeline/Location.h b/include/revng/Pipeline/Location.h index 4943b0ebe..cc3a1c9cc 100644 --- a/include/revng/Pipeline/Location.h +++ b/include/revng/Pipeline/Location.h @@ -137,8 +137,8 @@ public: auto Success = compile_time::repeatAnd([&] { using T = typename std::tuple_element::type; - using revng::detail::deserializeImpl; - auto MaybeValue = deserializeImpl(MaybeSteps->at(Idx + 2)); + using revng::detail::fromStringImpl; + auto MaybeValue = fromStringImpl(MaybeSteps->at(Idx + 2)); if (!MaybeValue) return false; diff --git a/include/revng/Pipes/ModelGlobal.h b/include/revng/Pipes/ModelGlobal.h index 8d4fce73f..d19381b67 100644 --- a/include/revng/Pipes/ModelGlobal.h +++ b/include/revng/Pipes/ModelGlobal.h @@ -74,7 +74,7 @@ getTypeDefinitionsAndCommit(pipeline::ExecutionContext &EC, auto Extractor = [&](const pipeline::Target &Target) -> const TypeDefinition & { using KeyTuple = TypeDefinition::Key; - auto Key = cantFail(deserialize(Target.getPathComponents()[0])); + auto Key = cantFail(fromString(Target.getPathComponents()[0])); return *Binary->TypeDefinitions().at(Key); }; for (const auto &T : diff --git a/include/revng/Pipes/TupleTreeContainer.h b/include/revng/Pipes/TupleTreeContainer.h index b39d60081..3c8a0dbff 100644 --- a/include/revng/Pipes/TupleTreeContainer.h +++ b/include/revng/Pipes/TupleTreeContainer.h @@ -129,7 +129,7 @@ public: } const auto &Serialized = Buffer.getBuffer(); - auto Result(llvm::errorOrToExpected(TupleTree::deserialize(Serialized))); + auto Result(llvm::errorOrToExpected(TupleTree::fromString(Serialized))); if (not Result) return Result.takeError(); diff --git a/include/revng/Support/YAMLTraits.h b/include/revng/Support/YAMLTraits.h index c163429f3..868888724 100644 --- a/include/revng/Support/YAMLTraits.h +++ b/include/revng/Support/YAMLTraits.h @@ -241,7 +241,7 @@ std::string toString(const T &ToDump) { namespace revng::detail { template llvm::Expected -deserializeImpl(llvm::StringRef YAMLString, void *Context = nullptr) { +fromStringImpl(llvm::StringRef YAMLString, void *Context = nullptr) { if constexpr (HasScalarOrEnumTraits) { return getValueFromYAMLScalar(YAMLString); } else { @@ -272,18 +272,18 @@ concept NotTupleTreeRoot = !requires(T &&) { template llvm::Expected -deserialize(llvm::StringRef YAMLString, void *Context = nullptr) { - return revng::detail::deserializeImpl(YAMLString, Context); +fromString(llvm::StringRef YAMLString, void *Context = nullptr) { + return revng::detail::fromStringImpl(YAMLString, Context); } template llvm::Expected -deserializeFileOrSTDIN(const llvm::StringRef &Path, void *Context = nullptr) { +fromFileOrSTDIN(const llvm::StringRef &Path, void *Context = nullptr) { auto MaybeBuffer = llvm::MemoryBuffer::getFileOrSTDIN(Path); if (not MaybeBuffer) return llvm::errorCodeToError(MaybeBuffer.getError()); - return deserialize((*MaybeBuffer)->getBuffer(), Context); + return fromString((*MaybeBuffer)->getBuffer(), Context); } template diff --git a/include/revng/TupleTree/TupleTree.h b/include/revng/TupleTree/TupleTree.h index b88444227..136c2c345 100644 --- a/include/revng/TupleTree/TupleTree.h +++ b/include/revng/TupleTree/TupleTree.h @@ -149,10 +149,10 @@ public: } public: - static llvm::ErrorOr deserialize(llvm::StringRef YAMLString) { + static llvm::ErrorOr fromString(llvm::StringRef YAMLString) { TupleTree Result{}; - auto MaybeRoot = revng::detail::deserializeImpl(YAMLString); + auto MaybeRoot = revng::detail::fromStringImpl(YAMLString); if (not MaybeRoot) return llvm::errorToErrorCode(MaybeRoot.takeError()); @@ -169,7 +169,7 @@ public: if (not MaybeBuffer) return MaybeBuffer.getError(); - return deserialize((*MaybeBuffer)->getBuffer()); + return fromString((*MaybeBuffer)->getBuffer()); } static llvm::ErrorOr fromFile(const llvm::StringRef &Path) { @@ -177,7 +177,7 @@ public: if (not MaybeBuffer) return MaybeBuffer.getError(); - return deserialize((*MaybeBuffer)->getBuffer()); + return fromString((*MaybeBuffer)->getBuffer()); } llvm::Error toFile(const llvm::StringRef &Path) const { diff --git a/include/revng/TupleTree/TupleTreeDiff.h b/include/revng/TupleTree/TupleTreeDiff.h index 9f0d7410c..cac5968cb 100644 --- a/include/revng/TupleTree/TupleTreeDiff.h +++ b/include/revng/TupleTree/TupleTreeDiff.h @@ -151,8 +151,8 @@ public: template struct TupleTreeDiff { public: - static llvm::Expected> deserialize(llvm::StringRef Input) { - return ::deserialize>(Input); + static llvm::Expected> fromString(llvm::StringRef Input) { + return ::fromString>(Input); } public: diff --git a/lib/Model/LoadModelPass.cpp b/lib/Model/LoadModelPass.cpp index 4c737bdc8..3697ed510 100644 --- a/lib/Model/LoadModelPass.cpp +++ b/lib/Model/LoadModelPass.cpp @@ -45,7 +45,7 @@ TupleTree loadModel(const llvm::Module &M) { Metadata *MD = Tuple->getOperand(0).get(); StringRef YAMLString = cast(MD)->getString(); - return std::move(TupleTree::deserialize(YAMLString).get()); + return std::move(TupleTree::fromString(YAMLString).get()); } bool LoadModelWrapperPass::doInitialization(Module &M) { diff --git a/lib/Pipeline/Global.cpp b/lib/Pipeline/Global.cpp index 09ed17c1b..527692997 100644 --- a/lib/Pipeline/Global.cpp +++ b/lib/Pipeline/Global.cpp @@ -45,6 +45,7 @@ Error Global::load(const revng::FilePath &Path) { return MaybeBuffer.takeError(); } - llvm::Error DeserializeError = deserialize(MaybeBuffer.get()->buffer()); + llvm::StringRef String = MaybeBuffer.get()->buffer().getBuffer(); + llvm::Error DeserializeError = fromString(String); return DeserializeError; } diff --git a/lib/Pipeline/Step.cpp b/lib/Pipeline/Step.cpp index a858165b2..6886fb854 100644 --- a/lib/Pipeline/Step.cpp +++ b/lib/Pipeline/Step.cpp @@ -420,7 +420,7 @@ Step::loadInvalidationMetadataImpl(const revng::DirectoryPath &Path, return File.takeError(); using Type = llvm::SmallVector; - auto Parsed = ::deserialize(File.get()->buffer().getBuffer()); + auto Parsed = ::fromString(File.get()->buffer().getBuffer()); if (not Parsed) return Parsed.takeError(); diff --git a/lib/Pipes/GlobalsAnalyses.cpp b/lib/Pipes/GlobalsAnalyses.cpp index ff4bd3ab6..a19734297 100644 --- a/lib/Pipes/GlobalsAnalyses.cpp +++ b/lib/Pipes/GlobalsAnalyses.cpp @@ -32,7 +32,7 @@ static llvm::Error applyDiffImpl(pipeline::ExecutionContext &EC, return GlobalOrError.takeError(); auto &Global = GlobalOrError.get(); - auto MaybeDiff = Global->deserializeDiff(*Buffer); + auto MaybeDiff = Global->diffFromString(Buffer->getBuffer()); if (not MaybeDiff) return MaybeDiff.takeError(); diff --git a/lib/Yield/Pipes/AssemblyPipes.cpp b/lib/Yield/Pipes/AssemblyPipes.cpp index f502920dc..8f6c222d6 100644 --- a/lib/Yield/Pipes/AssemblyPipes.cpp +++ b/lib/Yield/Pipes/AssemblyPipes.cpp @@ -72,7 +72,7 @@ void YieldAssembly::run(pipeline::ExecutionContext &Context, getFunctionsAndCommit(Context, Output.name())) { MetaAddress Address = Function.Entry(); llvm::StringRef YamlText = Input.at(Address); - auto MaybeFunction = TupleTree::deserialize(YamlText); + auto MaybeFunction = TupleTree::fromString(YamlText); revng_assert(MaybeFunction && MaybeFunction->verify()); revng_assert((*MaybeFunction)->Entry() == Address); diff --git a/lib/Yield/Pipes/CFGPipes.cpp b/lib/Yield/Pipes/CFGPipes.cpp index 60dd0bd54..aeb1146ad 100644 --- a/lib/Yield/Pipes/CFGPipes.cpp +++ b/lib/Yield/Pipes/CFGPipes.cpp @@ -27,7 +27,7 @@ void YieldControlFlow::run(pipeline::ExecutionContext &Context, getFunctionsAndCommit(Context, Output.name())) { MetaAddress Address = Function.Entry(); llvm::StringRef YamlText = Input.at(Address); - auto MaybeFunction = TupleTree::deserialize(YamlText); + auto MaybeFunction = TupleTree::fromString(YamlText); revng_assert(MaybeFunction && MaybeFunction->verify()); revng_assert((*MaybeFunction)->Entry() == Address); diff --git a/lib/Yield/Pipes/CallGraphPipes.cpp b/lib/Yield/Pipes/CallGraphPipes.cpp index 7d967ed7d..020b2379b 100644 --- a/lib/Yield/Pipes/CallGraphPipes.cpp +++ b/lib/Yield/Pipes/CallGraphPipes.cpp @@ -38,7 +38,7 @@ void ProcessCallGraph::run(pipeline::ExecutionContext &Context, SortedVector Metadata; for (const auto &[Address, CFGString] : CFGMap) Metadata - .insert(*TupleTree::deserialize(CFGString)->get()); + .insert(*TupleTree::fromString(CFGString)->get()); // If some functions are missing, do not output anything if (Metadata.size() != Model->Functions().size()) diff --git a/tests/abi/tools/revng-check-compatibility-with-abi/Main.cpp b/tests/abi/tools/revng-check-compatibility-with-abi/Main.cpp index 63d4242fe..76c2a9a28 100644 --- a/tests/abi/tools/revng-check-compatibility-with-abi/Main.cpp +++ b/tests/abi/tools/revng-check-compatibility-with-abi/Main.cpp @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) { revng_abort(Error.c_str()); } - auto Deserialized = TupleTree::deserialize(InputText); + auto Deserialized = TupleTree::fromString(InputText); if (!Deserialized) { std::string Error = "Unable to deserialize the model: '" + Options::Filename + "'."; diff --git a/tests/unit/Model.cpp b/tests/unit/Model.cpp index 6fee35820..925fde28f 100644 --- a/tests/unit/Model.cpp +++ b/tests/unit/Model.cpp @@ -275,7 +275,7 @@ BOOST_AUTO_TEST_CASE(TestTupleTreeDiffDeserialization) { auto Diff = diff(Empty, New); std::string S = toString(Diff); - auto Diff2 = llvm::cantFail(deserialize>(S)); + auto Diff2 = llvm::cantFail(fromString>(S)); std::string S2 = toString(Diff2); BOOST_TEST(S == S2); diff --git a/tests/unit/ModelType.cpp b/tests/unit/ModelType.cpp index e7108065f..557e160be 100644 --- a/tests/unit/ModelType.cpp +++ b/tests/unit/ModelType.cpp @@ -23,7 +23,7 @@ serializeDeserialize(const TupleTree &T) { std::string Buffer; T.serialize(Buffer); - auto Deserialized = TupleTree::deserialize(Buffer); + auto Deserialized = TupleTree::fromString(Buffer); std::string OtherBuffer; Deserialized->serialize(OtherBuffer); diff --git a/tools/model/apply/Main.cpp b/tools/model/apply/Main.cpp index 61911028b..02ce6cc79 100644 --- a/tools/model/apply/Main.cpp +++ b/tools/model/apply/Main.cpp @@ -44,7 +44,7 @@ int main(int Argc, char *Argv[]) { ExitOnError(Model.takeError()); using TypeDiff = TupleTreeDiff; - auto Diff = ExitOnError(deserializeFileOrSTDIN(DiffPath)); + auto Diff = ExitOnError(fromFileOrSTDIN(DiffPath)); ExitOnError(Diff.apply(*Model)); diff --git a/tools/pipeline/Main.cpp b/tools/pipeline/Main.cpp index f1b37efb1..80a83fff3 100644 --- a/tools/pipeline/Main.cpp +++ b/tools/pipeline/Main.cpp @@ -180,7 +180,7 @@ int main(int argc, char *argv[]) { if (not ApplyModelDiff.empty()) { using Type = TupleTreeDiff; - auto Diff = AbortOnError(deserializeFileOrSTDIN(ApplyModelDiff)); + auto Diff = AbortOnError(fromFileOrSTDIN(ApplyModelDiff)); auto &Runner = Manager.getRunner(); TargetInStepSet Map;