From e72ad2cd524ff38f162a23d69da5f78494d337ae Mon Sep 17 00:00:00 2001 From: Richard-Qin-X Date: Fri, 28 Aug 2026 13:45:07 +0800 Subject: [CodeGen] Centralize machine instruction erasure --- backend/lib/CodeGen/MachineCombiner.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'backend/lib/CodeGen/MachineCombiner.cpp') diff --git a/backend/lib/CodeGen/MachineCombiner.cpp b/backend/lib/CodeGen/MachineCombiner.cpp index 4c2ff88..4341700 100644 --- a/backend/lib/CodeGen/MachineCombiner.cpp +++ b/backend/lib/CodeGen/MachineCombiner.cpp @@ -175,18 +175,11 @@ namespace { if (!Fused) return std::unexpected(Fused.error()); - MachineBasicBlock *Block = Root.parent(); - if (Block == nullptr) - return makeUnexpected(ErrorCode::InternalError, "machine combiner root is detached"); - auto Removed = Block->removeInstruction(Root); + auto Removed = Root.eraseFromParent(); if (!Removed) return std::unexpected(Removed.error()); if (EraseProducer) { - MachineBasicBlock *ProducerBlock = Producer.parent(); - if (ProducerBlock == nullptr) { - return makeUnexpected(ErrorCode::InternalError, "machine combiner producer is detached"); - } - Removed = ProducerBlock->removeInstruction(Producer); + Removed = Producer.eraseFromParent(); if (!Removed) return std::unexpected(Removed.error()); } -- cgit v1.2.3