diff options
| author | Gabor Greif <ggreif@gmail.com> | 2010-04-16 01:16:20 +0000 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2010-04-16 01:16:20 +0000 |
| commit | ab05d8fcf61f7b926cf3e08f111794c69ca60690 (patch) | |
| tree | a24f057eee6bdd4edd74d509424b13bed1dda2de /lib/Transforms/Utils/AddrModeMatcher.cpp | |
| parent | 7a483c8626a4a34f93c463e65d1193b9e61777af (diff) | |
| download | external_llvm-ab05d8fcf61f7b926cf3e08f111794c69ca60690.zip external_llvm-ab05d8fcf61f7b926cf3e08f111794c69ca60690.tar.gz external_llvm-ab05d8fcf61f7b926cf3e08f111794c69ca60690.tar.bz2 | |
back out r101423 and r101397, they break llvm-gcc self-host on darwin10
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101434 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Utils/AddrModeMatcher.cpp')
| -rw-r--r-- | lib/Transforms/Utils/AddrModeMatcher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Transforms/Utils/AddrModeMatcher.cpp b/lib/Transforms/Utils/AddrModeMatcher.cpp index 474b5fd..ea9d1c1 100644 --- a/lib/Transforms/Utils/AddrModeMatcher.cpp +++ b/lib/Transforms/Utils/AddrModeMatcher.cpp @@ -382,7 +382,7 @@ static bool IsOperandAMemoryOperand(CallInst *CI, InlineAsm *IA, Value *OpVal, std::vector<InlineAsm::ConstraintInfo> Constraints = IA->ParseConstraints(); - unsigned ArgNo = 0; // ArgNo - The operand of the CallInst. + unsigned ArgNo = 1; // ArgNo - The operand of the CallInst. for (unsigned i = 0, e = Constraints.size(); i != e; ++i) { TargetLowering::AsmOperandInfo OpInfo(Constraints[i]); @@ -450,7 +450,7 @@ static bool FindAllMemoryUses(Instruction *I, if (CallInst *CI = dyn_cast<CallInst>(U)) { InlineAsm *IA = dyn_cast<InlineAsm>(CI->getCalledValue()); - if (!IA) return true; + if (IA == 0) return true; // If this is a memory operand, we're cool, otherwise bail out. if (!IsOperandAMemoryOperand(CI, IA, I, TLI)) |