[llvm-commits] [llvm] r66920 - in /llvm/trunk: include/llvm/Instructions.h include/llvm/Support/CallSite.h lib/Analysis/IPA/Andersens.cpp lib/Analysis/IPA/GlobalsModRef.cpp lib/Bitcode/Writer/BitcodeWriter.cpp lib/Transforms/IPO/DeadArgumentElimi

Bill Wendling isanbard at gmail.com
Fri Mar 13 14:17:37 PDT 2009


Gabor,

I'm pretty sure that this was causing these failures in the
self-hosting buildbot (in release mode). I reverted this for now.
Could you investigate please?

Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/dg.exp
...
FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/crash-narrowfunctiontest.ll
Failed with signal(SIGBUS) at line 1
while running: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/crash-narrowfunctiontest.ll
-bugpoint-crashcalls -silence-passes > /dev/null
0   bugpoint          0x0035dd25 llvm::sys::SetInterruptFunction(void
(*)()) + 85
1   bugpoint          0x0035e382
llvm::sys::RemoveFileOnSignal(llvm::sys::Path const&, std::string*) +
706
2   libSystem.B.dylib 0x92f112bb _sigtramp + 43
3   libSystem.B.dylib 0xffffffff _sigtramp + 1829694831
4   bugpoint          0x00021d1c main + 92
5   bugpoint          0x00002106 start + 54
6   bugpoint          0x00000004 start + 18446744073709543220
Stack dump:
0.	Program arguments: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/crash-narrowfunctiontest.ll
-bugpoint-crashcalls -silence-passes

FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/misopt-basictest.ll
Failed with signal(SIGBUS) at line 1
while running: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/misopt-basictest.ll
-dce -bugpoint-deletecalls -simplifycfg -silence-passes
0   bugpoint          0x0035dd25 llvm::sys::SetInterruptFunction(void
(*)()) + 85
1   bugpoint          0x0035e382
llvm::sys::RemoveFileOnSignal(llvm::sys::Path const&, std::string*) +
706
2   libSystem.B.dylib 0x92f112bb _sigtramp + 43
3   libSystem.B.dylib 0xffffffff _sigtramp + 1829694831
4   bugpoint          0x00021d1c main + 92
5   bugpoint          0x00002106 start + 54
6   bugpoint          0x00000006 start + 18446744073709543222
Stack dump:
0.	Program arguments: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/misopt-basictest.ll
-dce -bugpoint-deletecalls -simplifycfg -silence-passes

FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/remove_arguments_test.ll
Failed with signal(SIGBUS) at line 1
while running: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/remove_arguments_test.ll
 -bugpoint-crashcalls -silence-passes
0   bugpoint          0x0035dd25 llvm::sys::SetInterruptFunction(void
(*)()) + 85
1   bugpoint          0x0035e382
llvm::sys::RemoveFileOnSignal(llvm::sys::Path const&, std::string*) +
706
2   libSystem.B.dylib 0x92f112bb _sigtramp + 43
3   libSystem.B.dylib 0xffffffff _sigtramp + 1829694831
4   bugpoint          0x00021d1c main + 92
5   bugpoint          0x00002106 start + 54
Stack dump:
0.	Program arguments: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/remove_arguments_test.ll
-bugpoint-crashcalls -silence-passes



On Fri, Mar 13, 2009 at 10:27 AM, Gabor Greif <ggreif at gmail.com> wrote:
> Author: ggreif
> Date: Fri Mar 13 13:27:29 2009
> New Revision: 66920
>
> URL: http://llvm.org/viewvc/llvm-project?rev=66920&view=rev
> Log:
> Second installment of "BasicBlock operands to the back"
> changes.
>
> For InvokeInst now all arguments begin at op_begin().
> The Callee, Cont and Fail are now faster to get by
> access relative to op_end().
>Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/dg.exp ...
FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/crash-narrowfunctiontest.ll
Failed with signal(SIGBUS) at line 1
while running: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/crash-narrowfunctiontest.ll
-bugpoint-crashcalls -silence-passes > /dev/null
0   bugpoint          0x0035dd25 llvm::sys::SetInterruptFunction(void
(*)()) + 85
1   bugpoint          0x0035e382
llvm::sys::RemoveFileOnSignal(llvm::sys::Path const&, std::string*) +
706
2   libSystem.B.dylib 0x92f112bb _sigtramp + 43
3   libSystem.B.dylib 0xffffffff _sigtramp + 1829694831
4   bugpoint          0x00021d1c main + 92
5   bugpoint          0x00002106 start + 54
6   bugpoint          0x00000004 start + 18446744073709543220
Stack dump:
0.	Program arguments: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/crash-narrowfunctiontest.ll
-bugpoint-crashcalls -silence-passes

FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/misopt-basictest.ll
Failed with signal(SIGBUS) at line 1
while running: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/misopt-basictest.ll
-dce -bugpoint-deletecalls -simplifycfg -silence-passes
0   bugpoint          0x0035dd25 llvm::sys::SetInterruptFunction(void
(*)()) + 85
1   bugpoint          0x0035e382
llvm::sys::RemoveFileOnSignal(llvm::sys::Path const&, std::string*) +
706
2   libSystem.B.dylib 0x92f112bb _sigtramp + 43
3   libSystem.B.dylib 0xffffffff _sigtramp + 1829694831
4   bugpoint          0x00021d1c main + 92
5   bugpoint          0x00002106 start + 54
6   bugpoint          0x00000006 start + 18446744073709543222
Stack dump:
0.	Program arguments: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/misopt-basictest.ll
-dce -bugpoint-deletecalls -simplifycfg -silence-passes

FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/remove_arguments_test.ll
Failed with signal(SIGBUS) at line 1
while running: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/remove_arguments_test.ll
 -bugpoint-crashcalls -silence-passes
0   bugpoint          0x0035dd25 llvm::sys::SetInterruptFunction(void
(*)()) + 85
1   bugpoint          0x0035e382
llvm::sys::RemoveFileOnSignal(llvm::sys::Path const&, std::string*) +
706
2   libSystem.B.dylib 0x92f112bb _sigtramp + 43
3   libSystem.B.dylib 0xffffffff _sigtramp + 1829694831
4   bugpoint          0x00021d1c main + 92
5   bugpoint          0x00002106 start + 54
Stack dump:
0.	Program arguments: bugpoint
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/BugPoint/remove_arguments_test.ll
-bugpoint-crashcalls -silence-passes


> This patch introduces some temporary uglyness in CallSite.
> Next I'll bring CallInst up to a similar scheme and then
> the uglyness will magically vanish.
>
> This patch also exposes all the reliance of the libraries
> on InvokeInst's operand ordering. I am thinking of taking
> care of that too.
>
> Modified:
>    llvm/trunk/include/llvm/Instructions.h
>    llvm/trunk/include/llvm/Support/CallSite.h
>    llvm/trunk/lib/Analysis/IPA/Andersens.cpp
>    llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp
>    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>    llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
>    llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
>    llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp
>    llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp
>    llvm/trunk/lib/VMCore/AsmWriter.cpp
>    llvm/trunk/lib/VMCore/Instructions.cpp
>    llvm/trunk/lib/VMCore/Verifier.cpp
>
> Modified: llvm/trunk/include/llvm/Instructions.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Instructions.h?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Instructions.h (original)
> +++ llvm/trunk/include/llvm/Instructions.h Fri Mar 13 13:27:29 2009
> @@ -2526,27 +2526,26 @@
>   /// indirect function invocation.
>   ///
>   Function *getCalledFunction() const {
> -    return dyn_cast<Function>(getOperand(0));
> +    return dyn_cast<Function>(Op<-3>());
>   }
>
>   /// getCalledValue - Get a pointer to the function that is invoked by this
>   /// instruction
> -  const Value *getCalledValue() const { return getOperand(0); }
> -        Value *getCalledValue()       { return getOperand(0); }
> +  const Value *getCalledValue() const { return Op<-3>(); }
> +        Value *getCalledValue()       { return Op<-3>(); }
>
>   // get*Dest - Return the destination basic blocks...
>   BasicBlock *getNormalDest() const {
> -    return cast<BasicBlock>(getOperand(1));
> +    return cast<BasicBlock>(Op<-2>());
>   }
>   BasicBlock *getUnwindDest() const {
> -    return cast<BasicBlock>(getOperand(2));
> +    return cast<BasicBlock>(Op<-1>());
>   }
>   void setNormalDest(BasicBlock *B) {
> -    setOperand(1, B);
> +    Op<-2>() = B;
>   }
> -
>   void setUnwindDest(BasicBlock *B) {
> -    setOperand(2, B);
> +    Op<-1>() = B;
>   }
>
>   BasicBlock *getSuccessor(unsigned i) const {
> @@ -2556,7 +2555,7 @@
>
>   void setSuccessor(unsigned idx, BasicBlock *NewSucc) {
>     assert(idx < 2 && "Successor # out of range for invoke!");
> -    setOperand(idx+1, NewSucc);
> +    *(&Op<-2>() + idx) = NewSucc;
>   }
>
>   unsigned getNumSuccessors() const { return 2; }
> @@ -2569,6 +2568,7 @@
>   static inline bool classof(const Value *V) {
>     return isa<Instruction>(V) && classof(cast<Instruction>(V));
>   }
> +
>  private:
>   virtual BasicBlock *getSuccessorV(unsigned idx) const;
>   virtual unsigned getNumSuccessorsV() const;
>
> Modified: llvm/trunk/include/llvm/Support/CallSite.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CallSite.h?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Support/CallSite.h (original)
> +++ llvm/trunk/include/llvm/Support/CallSite.h Fri Mar 13 13:27:29 2009
> @@ -119,7 +119,7 @@
>   ///
>   Value *getCalledValue() const {
>     assert(getInstruction() && "Not a call or invoke instruction!");
> -    return getInstruction()->getOperand(0);
> +    return *getCallee();
>   }
>
>   /// getCalledFunction - Return the function being called if this is a direct
> @@ -133,7 +133,7 @@
>   ///
>   void setCalledFunction(Value *V) {
>     assert(getInstruction() && "Not a call or invoke instruction!");
> -    getInstruction()->setOperand(0, V);
> +    *getCallee() = V;
>   }
>
>   Value *getArgument(unsigned ArgNo) const {
> @@ -147,6 +147,16 @@
>     getInstruction()->setOperand(getArgumentOffset() + ArgNo, newVal);
>   }
>
> +  /// Given a value use iterator, returns the argument that corresponds to it.
> +  /// Iterator must actually correspond to an argument.
> +  unsigned getArgumentNo(Value::use_iterator I) const {
> +    assert(getInstruction() && "Not a call or invoke instruction!");
> +    assert(arg_begin() <= &I.getUse() && &I.getUse() < arg_end()
> +           && "Argument # out of range!");
> +
> +    return &I.getUse() - arg_begin();
> +  }
> +
>   /// Given an operand number, returns the argument that corresponds to it.
>   /// OperandNo must be a valid operand number that actually corresponds to an
>   /// argument.
> @@ -172,7 +182,7 @@
>     return getInstruction()->op_begin() + getArgumentOffset();
>   }
>
> -  arg_iterator arg_end() const { return getInstruction()->op_end(); }
> +  arg_iterator arg_end() const { return getInstruction()->op_end() - getArgumentEndOffset(); }
>   bool arg_empty() const { return arg_end() == arg_begin(); }
>   unsigned arg_size() const { return unsigned(arg_end() - arg_begin()); }
>
> @@ -181,17 +191,25 @@
>   }
>
>   bool isCallee(Value::use_iterator UI) const {
> -    return getInstruction()->op_begin() == &UI.getUse();
> +    return getCallee() == &UI.getUse();
>   }
> -
>  private:
>   /// Returns the operand number of the first argument
>   unsigned getArgumentOffset() const {
>     if (isCall())
>       return 1; // Skip Function
>     else
> -      return 3; // Skip Function, BB, BB
> +      return 0; // Args are at the front
>   }
> +
> +  unsigned getArgumentEndOffset() const {
> +    if (isCall())
> +      return 0; // Unchanged
> +    else
> +      return 3; // Skip BB, BB, Function
> +  }
> +
> +  User::op_iterator getCallee() const;
>  };
>
>  } // End llvm namespace
>
> Modified: llvm/trunk/lib/Analysis/IPA/Andersens.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/Andersens.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Analysis/IPA/Andersens.cpp (original)
> +++ llvm/trunk/lib/Analysis/IPA/Andersens.cpp Fri Mar 13 13:27:29 2009
> @@ -1012,7 +1012,7 @@
>     } else if (InvokeInst *II = dyn_cast<InvokeInst>(*UI)) {
>       // Make sure that this is just the function being called, not that it is
>       // passing into the function.
> -      for (unsigned i = 3, e = II->getNumOperands(); i != e; ++i)
> +      for (unsigned i = 0, e = II->getNumOperands() - 3; i != e; ++i)
>         if (II->getOperand(i) == V) return true;
>     } else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(*UI)) {
>       if (CE->getOpcode() == Instruction::GetElementPtr ||
>
> Modified: llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp (original)
> +++ llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp Fri Mar 13 13:27:29 2009
> @@ -244,7 +244,7 @@
>     } else if (InvokeInst *II = dyn_cast<InvokeInst>(*UI)) {
>       // Make sure that this is just the function being called, not that it is
>       // passing into the function.
> -      for (unsigned i = 3, e = II->getNumOperands(); i != e; ++i)
> +      for (unsigned i = 0, e = II->getNumOperands() - 3; i != e; ++i)
>         if (II->getOperand(i) == V) return true;
>     } else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(*UI)) {
>       if (CE->getOpcode() == Instruction::GetElementPtr ||
>
> Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Fri Mar 13 13:27:29 2009
> @@ -853,11 +853,11 @@
>
>     // Emit value #'s for the fixed parameters.
>     for (unsigned i = 0, e = FTy->getNumParams(); i != e; ++i)
> -      Vals.push_back(VE.getValueID(I.getOperand(i+3)));  // fixed param.
> +      Vals.push_back(VE.getValueID(I.getOperand(i)));  // fixed param.
>
>     // Emit type/value pairs for varargs params.
>     if (FTy->isVarArg()) {
> -      for (unsigned i = 3+FTy->getNumParams(), e = I.getNumOperands();
> +      for (unsigned i = FTy->getNumParams(), e = I.getNumOperands()-3;
>            i != e; ++i)
>         PushValueAndType(I.getOperand(i), InstID, Vals, VE); // vararg
>     }
>
> Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Fri Mar 13 13:27:29 2009
> @@ -356,14 +356,14 @@
>         // argument, since if it was the function argument this would be an
>         // indirect call and the we know can't be looking at a value of the
>         // label type (for the invoke instruction).
> -        unsigned ArgNo = CS.getArgumentNo(U.getOperandNo());
> +        unsigned ArgNo = CS.getArgumentNo(U);
>
>         if (ArgNo >= F->getFunctionType()->getNumParams())
>           // The value is passed in through a vararg! Must be live.
>           return Live;
>
> -        assert(CS.getArgument(ArgNo)
> -               == CS.getInstruction()->getOperand(U.getOperandNo())
> +        assert(CS.getArgument(ArgNo)
> +               == CS.getInstruction()->getOperand(U.getOperandNo())
>                && "Argument is not where we expected it");
>
>         // Value passed to a normal call. It's only live when the corresponding
>
> Modified: llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original)
> +++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Fri Mar 13 13:27:29 2009
> @@ -170,7 +170,7 @@
>   for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
>     if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator()))
>       if (II->doesNotThrow()) {
> -        SmallVector<Value*, 8> Args(II->op_begin()+3, II->op_end());
> +        SmallVector<Value*, 8> Args(II->op_begin(), II->op_end() - 3);
>         // Insert a call instruction before the invoke.
>         CallInst *Call = CallInst::Create(II->getCalledValue(),
>                                           Args.begin(), Args.end(), "", II);
>
> Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp Fri Mar 13 13:27:29 2009
> @@ -78,7 +78,7 @@
>  /// ChangeToCall - Convert the specified invoke into a normal call.
>  static void ChangeToCall(InvokeInst *II) {
>   BasicBlock *BB = II->getParent();
> -  SmallVector<Value*, 8> Args(II->op_begin()+3, II->op_end());
> +  SmallVector<Value*, 8> Args(II->op_begin(), II->op_end() - 3);
>   CallInst *NewCall = CallInst::Create(II->getCalledValue(), Args.begin(),
>                                        Args.end(), "", II);
>   NewCall->takeName(II);
>
> Modified: llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp (original)
> +++ llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp Fri Mar 13 13:27:29 2009
> @@ -221,7 +221,7 @@
>   bool Changed = false;
>   for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
>     if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator())) {
> -      std::vector<Value*> CallArgs(II->op_begin()+3, II->op_end());
> +      std::vector<Value*> CallArgs(II->op_begin(), II->op_end() - 3);
>       // Insert a normal call instruction...
>       CallInst *NewCall = CallInst::Create(II->getCalledValue(),
>                                            CallArgs.begin(), CallArgs.end(), "",II);
> @@ -290,7 +290,7 @@
>   CatchSwitch->addCase(InvokeNoC, II->getUnwindDest());
>
>   // Insert a normal call instruction.
> -  std::vector<Value*> CallArgs(II->op_begin()+3, II->op_end());
> +  std::vector<Value*> CallArgs(II->op_begin(), II->op_end() - 3);
>   CallInst *NewCall = CallInst::Create(II->getCalledValue(),
>                                        CallArgs.begin(), CallArgs.end(), "",
>                                        II);
>
> Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
> +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Fri Mar 13 13:27:29 2009
> @@ -1625,6 +1625,7 @@
>     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();
> @@ -1658,10 +1659,10 @@
>       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 << ')';
>
> Modified: llvm/trunk/lib/VMCore/Instructions.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/VMCore/Instructions.cpp (original)
> +++ llvm/trunk/lib/VMCore/Instructions.cpp Fri Mar 13 13:27:29 2009
> @@ -93,6 +93,13 @@
>   return false;
>  }
>
> +User::op_iterator CallSite::getCallee() const {
> +  Instruction *II(getInstruction());
> +  return isCall()
> +    ? cast<CallInst>(II)->op_begin()
> +    : cast<InvokeInst>(II)->op_end() - 3; // Skip BB, BB, Function
> +}
> +
>  #undef CALLSITE_DELEGATE_GETTER
>  #undef CALLSITE_DELEGATE_SETTER
>
> @@ -431,10 +438,9 @@
>  void InvokeInst::init(Value *Fn, BasicBlock *IfNormal, BasicBlock *IfException,
>                       Value* const *Args, unsigned NumArgs) {
>   assert(NumOperands == 3+NumArgs && "NumOperands not set up?");
> -  Use *OL = OperandList;
> -  OL[0] = Fn;
> -  OL[1] = IfNormal;
> -  OL[2] = IfException;
> +  Op<-3>() = Fn;
> +  Op<-2>() = IfNormal;
> +  Op<-1>() = IfException;
>   const FunctionType *FTy =
>     cast<FunctionType>(cast<PointerType>(Fn->getType())->getElementType());
>   FTy = FTy;  // silence warning.
> @@ -443,12 +449,13 @@
>           (FTy->isVarArg() && NumArgs > FTy->getNumParams())) &&
>          "Calling a function with bad signature");
>
> +  Use *OL = OperandList;
>   for (unsigned i = 0, e = NumArgs; i != e; i++) {
>     assert((i >= FTy->getNumParams() ||
>             FTy->getParamType(i) == Args[i]->getType()) &&
>            "Invoking a function with a bad signature!");
>
> -    OL[i+3] = Args[i];
> +    OL[i] = Args[i];
>   }
>  }
>
>
> Modified: llvm/trunk/lib/VMCore/Verifier.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=66920&r1=66919&r2=66920&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/VMCore/Verifier.cpp (original)
> +++ llvm/trunk/lib/VMCore/Verifier.cpp Fri Mar 13 13:27:29 2009
> @@ -1318,7 +1318,7 @@
>                 "Instruction does not dominate all uses!", Op, &I);
>       }
>     } else if (isa<InlineAsm>(I.getOperand(i))) {
> -      Assert1(i == 0 && (isa<CallInst>(I) || isa<InvokeInst>(I)),
> +      Assert1((i == 0 && isa<CallInst>(I)) || (i + 3 == e && isa<InvokeInst>(I)),
>               "Cannot take the address of an inline asm!", &I);
>     }
>   }
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>




More information about the llvm-commits mailing list