From 25dd4a2daf1f527ed69a01a5ee1ccc5ef97412bd Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Wed, 24 Sep 2008 06:48:55 +0000 Subject: [PATCH] Commit CodeGenPrepare.cpp changes which was accidentially left out of 56526. llvm-svn: 56549 --- llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp b/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp index 3f2faf30fad8..a04ccfea361e 100644 --- a/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp +++ b/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp @@ -927,23 +927,6 @@ bool CodeGenPrepare::OptimizeLoadStoreInst(Instruction *LdStInst, Value *Addr, return true; } -/// hasInlineAsmMemConstraint - Return true if the inline asm instruction being -/// processed uses a memory 'm' constraint. -static bool -hasInlineAsmMemConstraint(std::vector &CInfos, - const TargetLowering *TLI) { - for (unsigned i = 0, e = CInfos.size(); i != e; ++i) { - InlineAsm::ConstraintInfo &CI = CInfos[i]; - for (unsigned j = 0, ee = CI.Codes.size(); j != ee; ++j) { - TargetLowering::ConstraintType CType = TLI->getConstraintType(CI.Codes[j]); - if (CType == TargetLowering::C_Memory) - return true; - } - } - - return false; -} - /// OptimizeInlineAsmInst - If there are any memory operands, use /// OptimizeLoadStoreInt to sink their address computing into the block when /// possible / profitable. @@ -980,8 +963,8 @@ bool CodeGenPrepare::OptimizeInlineAsmInst(Instruction *I, CallSite CS, } // Compute the constraint code and ConstraintType to use. - bool hasMemory = hasInlineAsmMemConstraint(ConstraintInfos, TLI); - TLI->ComputeConstraintToUse(OpInfo, SDValue(), hasMemory); + TLI->ComputeConstraintToUse(OpInfo, SDValue(), + OpInfo.ConstraintType == TargetLowering::C_Memory); if (OpInfo.ConstraintType == TargetLowering::C_Memory && OpInfo.isIndirect) { -- GitLab