diff options
author | Gabor Greif <ggreif@gmail.com> | 2009-09-03 00:18:58 +0000 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2009-09-03 00:18:58 +0000 |
commit | 190390b8d31af0a549827478911b322af4bc111a (patch) | |
tree | d509b4c1e1a00b7fa417aea5f7894dc3be00685d /lib/VMCore/AsmWriter.cpp | |
parent | 9947bbb2979d9e33366ac767c7677bc69b5252e6 (diff) | |
download | llvm-190390b8d31af0a549827478911b322af4bc111a.tar.gz llvm-190390b8d31af0a549827478911b322af4bc111a.tar.bz2 llvm-190390b8d31af0a549827478911b322af4bc111a.tar.xz |
re-commit r66920 (which has been backed out in r66953) I may have more luck this time. I'll back out if needed...
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80858 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore/AsmWriter.cpp')
-rw-r--r-- | lib/VMCore/AsmWriter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 5062075a46..5d5c2e3655 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -1863,6 +1863,7 @@ void AssemblyWriter::printInstruction(const Instruction &I) { if (PAL.getFnAttributes() != Attribute::None) Out << ' ' << Attribute::getAsString(PAL.getFnAttributes()); } else if (const InvokeInst *II = dyn_cast<InvokeInst>(&I)) { + Operand = II->getCalledValue(); const PointerType *PTy = cast<PointerType>(Operand->getType()); const FunctionType *FTy = cast<FunctionType>(PTy->getElementType()); const Type *RetTy = FTy->getReturnType(); @@ -1899,10 +1900,10 @@ void AssemblyWriter::printInstruction(const Instruction &I) { writeOperand(Operand, true); } Out << '('; - for (unsigned op = 3, Eop = I.getNumOperands(); op < Eop; ++op) { - if (op > 3) + for (unsigned op = 0, Eop = I.getNumOperands() - 3; op < Eop; ++op) { + if (op) Out << ", "; - writeParamOperand(I.getOperand(op), PAL.getParamAttributes(op-2)); + writeParamOperand(I.getOperand(op), PAL.getParamAttributes(op + 1)); } Out << ')'; |