From 8558f80b4077536d6aa46b97328d6df1210e261f Mon Sep 17 00:00:00 2001 From: Richard-Qin-X Date: Thu, 13 Aug 2026 13:18:05 +0800 Subject: [Support] Centralize error context handling --- backend/lib/CodeGen/MachineLICM.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'backend/lib/CodeGen/MachineLICM.cpp') diff --git a/backend/lib/CodeGen/MachineLICM.cpp b/backend/lib/CodeGen/MachineLICM.cpp index 31d792b..8a34d3b 100644 --- a/backend/lib/CodeGen/MachineLICM.cpp +++ b/backend/lib/CodeGen/MachineLICM.cpp @@ -62,11 +62,6 @@ namespace { return Stage == MachineCodeMotionStage::SelectedSSA ? Selected : PostRA; } -[[nodiscard]] Error prefixedError(const Error &Failure, std::string Prefix) { - Prefix.append(Failure.message()); - return Error(Failure.code(), std::move(Prefix)); -} - [[nodiscard]] bool containsBlock(const MachineLoop &Loop, const MachineBasicBlock *Block) noexcept { return std::ranges::find(Loop.Blocks, Block) != Loop.Blocks.end(); } @@ -344,7 +339,8 @@ Expected MachineLICMPass::run(MachineFunction &Function, Function, Target, MachineFunctionCloneOptions{.NewStableID = Function.stableID(), .NewName = std::nullopt}); if (!Trial) { - return std::unexpected(prefixedError(Trial.error(), "machine LICM transaction setup failed: ")); + return std::unexpected( + withErrorContext(Trial.error(), "machine LICM transaction setup failed: ")); } MachineFunctionAnalysisManager TrialAnalyses; auto TrialResult = runImplementation(*Trial->ClonedFunction, Target, TrialAnalyses); @@ -353,7 +349,7 @@ Expected MachineLICMPass::run(MachineFunction &Function, auto Result = runImplementation(Function, Target, Analyses); if (!Result) { - return std::unexpected(prefixedError( + return std::unexpected(withErrorContext( Result.error(), "machine LICM diverged after a successful transaction preflight: ")); } return Result; -- cgit v1.2.3