From d9df5017040489303acb57bdd8697ef0f8bafc08 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Thu, 9 Apr 2009 17:16:43 +0000 Subject: Fix pr3954. The register scavenger asserts for inline assembly with register destinations that are tied to source operands. The TargetInstrDescr::findTiedToSrcOperand method silently fails for inline assembly. The existing MachineInstr::isRegReDefinedByTwoAddr was very close to doing what is needed, so this revision makes a few changes to that method and also renames it to isRegTiedToUseOperand (for consistency with the very similar isRegTiedToDefOperand and because it handles both two-address instructions and inline assembly with tied registers). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@68714 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/RegisterScavenging.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/CodeGen/RegisterScavenging.cpp') diff --git a/lib/CodeGen/RegisterScavenging.cpp b/lib/CodeGen/RegisterScavenging.cpp index 9447ff2c41..944468ea11 100644 --- a/lib/CodeGen/RegisterScavenging.cpp +++ b/lib/CodeGen/RegisterScavenging.cpp @@ -188,7 +188,6 @@ void RegScavenger::forward() { MachineInstr *MI = MBBI; DistanceMap.insert(std::make_pair(MI, CurrDist++)); - const TargetInstrDesc &TID = MI->getDesc(); if (MI == ScavengeRestore) { ScavengedReg = 0; @@ -256,7 +255,7 @@ void RegScavenger::forward() { } // Skip two-address destination operand. - if (TID.findTiedToSrcOperand(Idx) != -1) { + if (MI->isRegTiedToUseOperand(Idx)) { assert(isUsed(Reg) && "Using an undefined register!"); continue; } @@ -284,7 +283,6 @@ void RegScavenger::backward() { MachineInstr *MI = MBBI; DistanceMap.erase(MI); --CurrDist; - const TargetInstrDesc &TID = MI->getDesc(); // Separate register operands into 3 classes: uses, defs, earlyclobbers. SmallVector, 4> UseMOs; @@ -313,7 +311,7 @@ void RegScavenger::backward() { ? DefMOs[i].second : EarlyClobberMOs[i-NumDefs].second; // Skip two-address destination operand. - if (TID.findTiedToSrcOperand(Idx) != -1) + if (MI->isRegTiedToUseOperand(Idx)) continue; unsigned Reg = MO.getReg(); -- cgit v1.2.3-70-g09d2