[llvm-commits] [llvm] r99399 - in /llvm/trunk: ./ include/llvm/Function.h include/llvm/Instructions.h include/llvm/Support/CallSite.h lib/Analysis/IPA/GlobalsModRef.cpp lib/Bitcode/Writer/BitcodeWriter.cpp lib/Transforms/IPO/DeadArgumentEliminati
Nick Lewycky
nicholas at mxc.ca
Sun Jul 11 09:11:04 PDT 2010
Gabor Greif wrote:
> Because those cases are already caught the line before? What survives
> is either a CallInst or an InvokeInst and both are safe to be casted
> to Instruction.
Err, thanks. Somehow I mentally elided the not signs. Both of them.
Sorry 'bout that!
Nick
> Gabor
>
> On 7/11/10, Nick Lewycky<nicholas at mxc.ca> wrote:
>> Gabor Greif wrote:
>>> Author: ggreif
>>> Date: Wed Mar 24 08:21:49 2010
>>> New Revision: 99399
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=99399&view=rev
>>> Log:
>>> Finally land the InvokeInst operand reordering.
>>> I have audited all getOperandNo calls now, fixing
>>> hidden assumptions. CallSite related uglyness will
>>> be eliminated successively.
>>>
>>> Note this patch has a long and griveous history,
>>> for all the back-and-forths have a look at
>>> CallSite.h's log.
>>>
>>> Modified:
>>> llvm/trunk/ (props changed)
>>> llvm/trunk/include/llvm/Function.h
>>> llvm/trunk/include/llvm/Instructions.h
>>> llvm/trunk/include/llvm/Support/CallSite.h
>>> 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/SCCP.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/Function.cpp
>>> llvm/trunk/lib/VMCore/Instructions.cpp
>>> llvm/trunk/lib/VMCore/Verifier.cpp
>>>
>>> Propchange: llvm/trunk/
>>> ------------------------------------------------------------------------------
>>> svn:mergeinfo = /llvm/branches/ggreif/InvokeInst-operands:98645-99398
>>>
>>> Modified: llvm/trunk/include/llvm/Function.h
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Function.h?rev=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/Function.h (original)
>>> +++ llvm/trunk/include/llvm/Function.h Wed Mar 24 08:21:49 2010
>>> @@ -409,8 +409,11 @@
>>> void dropAllReferences();
>>>
>>> /// hasAddressTaken - returns true if there are any uses of this
>>> function
>>> - /// other than direct calls or invokes to it.
>>> - bool hasAddressTaken() const;
>>> + /// other than direct calls or invokes to it. Optionally passes back
>>> the
>>> + /// offending user for diagnostic purposes.
>>> + ///
>>> + bool hasAddressTaken(const User** = 0) const;
>>> +
>>> private:
>>> // Shadow Value::setValueSubclassData with a private forwarding method
>>> so that
>>> // subclasses cannot accidentally use it.
>>>
>>> Modified: llvm/trunk/include/llvm/Instructions.h
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Instructions.h?rev=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/Instructions.h (original)
>>> +++ llvm/trunk/include/llvm/Instructions.h Wed Mar 24 08:21:49 2010
>>> @@ -2522,32 +2522,31 @@
>>> /// 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>(); }
>>>
>>> /// setCalledFunction - Set the function called.
>>> void setCalledFunction(Value* Fn) {
>>> - Op<0>() = Fn;
>>> + Op<-3>() = Fn;
>>> }
>>>
>>> // 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, (Value*)B);
>>> + Op<-2>() = reinterpret_cast<Value*>(B);
>>> }
>>> -
>>> void setUnwindDest(BasicBlock *B) {
>>> - setOperand(2, (Value*)B);
>>> + Op<-1>() = reinterpret_cast<Value*>(B);
>>> }
>>>
>>> BasicBlock *getSuccessor(unsigned i) const {
>>> @@ -2557,7 +2556,7 @@
>>>
>>> void setSuccessor(unsigned idx, BasicBlock *NewSucc) {
>>> assert(idx< 2&& "Successor # out of range for invoke!");
>>> - setOperand(idx+1, (Value*)NewSucc);
>>> + *(&Op<-2>() + idx) = reinterpret_cast<Value*>(NewSucc);
>>> }
>>>
>>> unsigned getNumSuccessors() const { return 2; }
>>> @@ -2570,6 +2569,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=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/Support/CallSite.h (original)
>>> +++ llvm/trunk/include/llvm/Support/CallSite.h Wed Mar 24 08:21:49 2010
>>> @@ -122,7 +122,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
>>> @@ -136,7 +136,7 @@
>>> ///
>>> void setCalledFunction(Value *V) {
>>> assert(getInstruction()&& "Not a call or invoke instruction!");
>>> - getInstruction()->setOperand(0, V);
>>> + *getCallee() = V;
>>> }
>>>
>>> Value *getArgument(unsigned ArgNo) const {
>>> @@ -150,6 +150,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.
>>> @@ -175,7 +185,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());
>>> }
>>>
>>> @@ -184,17 +194,28 @@
>>> }
>>>
>>> bool isCallee(Value::use_iterator UI) const {
>>> - return getInstruction()->op_begin() ==&UI.getUse();
>>> + return getCallee() ==&UI.getUse();
>>> + }
>>> + bool isCallee(Value::use_const_iterator UI) const {
>>> + 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/GlobalsModRef.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp?rev=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp (original)
>>> +++ llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp Wed Mar 24 08:21:49 2010
>>> @@ -257,7 +257,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=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
>>> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Wed Mar 24 08:21:49
>>> 2010
>>> @@ -1090,11 +1090,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=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Wed Mar 24
>>> 08:21:49 2010
>>> @@ -352,7 +352,7 @@
>>> // 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.
>>>
>>> Modified: llvm/trunk/lib/Transforms/IPO/PruneEH.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PruneEH.cpp?rev=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/IPO/PruneEH.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/IPO/PruneEH.cpp Wed Mar 24 08:21:49 2010
>>> @@ -168,7 +168,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/SCCP.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SCCP.cpp?rev=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Scalar/SCCP.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Scalar/SCCP.cpp Wed Mar 24 08:21:49 2010
>>> @@ -1717,7 +1717,8 @@
>>> return true; // Storing addr of GV.
>>> } else if (isa<InvokeInst>(U) || isa<CallInst>(U)) {
>>> // Make sure we are calling the function, not passing the address.
>>> - if (UI.getOperandNo() != 0)
>>> + CallSite CS((Instruction*)U);
>>> + if (!CS.isCallee(UI))
>>> return true;
>>> } else if (const LoadInst *LI = dyn_cast<LoadInst>(U)) {
>>> if (LI->isVolatile())
>>>
>>> Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp?rev=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Scalar/SimplifyCFGPass.cpp Wed Mar 24
>>> 08:21:49 2010
>>> @@ -79,7 +79,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=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp Wed Mar 24 08:21:49
>>> 2010
>>> @@ -226,7 +226,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);
>>> @@ -298,7 +298,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=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Wed Mar 24 08:21:49 2010
>>> @@ -1875,6 +1875,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();
>>> @@ -1912,10 +1913,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/Function.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Function.cpp?rev=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/Function.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/Function.cpp Wed Mar 24 08:21:49 2010
>>> @@ -16,6 +16,7 @@
>>> #include "llvm/IntrinsicInst.h"
>>> #include "llvm/LLVMContext.h"
>>> #include "llvm/CodeGen/ValueTypes.h"
>>> +#include "llvm/Support/CallSite.h"
>>> #include "llvm/Support/LeakDetector.h"
>>> #include "llvm/Support/ManagedStatic.h"
>>> #include "llvm/Support/StringPool.h"
>>> @@ -402,11 +403,14 @@
>>>
>>> /// hasAddressTaken - returns true if there are any uses of this
>>> function
>>> /// other than direct calls or invokes to it.
>>> -bool Function::hasAddressTaken() const {
>>> +bool Function::hasAddressTaken(const User* *PutOffender) const {
>>> for (Value::use_const_iterator I = use_begin(), E = use_end(); I != E;
>>> ++I) {
>>> - if (I.getOperandNo() != 0 ||
>>> - (!isa<CallInst>(*I)&& !isa<InvokeInst>(*I)))
>>> - return true;
>>> + const User *U = *I;
>>> + if (!isa<CallInst>(U)&& !isa<InvokeInst>(U))
>>> + return PutOffender ? (*PutOffender = U, true) : true;
>>> + CallSite CS(const_cast<Instruction*>(static_cast<const
>>> Instruction*>(U)));
>>> + if (!CS.isCallee(I))
>>> + return PutOffender ? (*PutOffender = U, true) : true;
>>
>> Why is it safe to cast to Instruction?? Isn't the user commonly a
>> Constant (vtable arrays, global aliases)??
>>
>> Nick
>>
>>> }
>>> return false;
>>> }
>>>
>>> Modified: llvm/trunk/lib/VMCore/Instructions.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/Instructions.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/Instructions.cpp Wed Mar 24 08:21:49 2010
>>> @@ -109,6 +109,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
>>>
>>> @@ -622,10 +629,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.
>>> @@ -634,12 +640,13 @@
>>> (FTy->isVarArg()&& NumArgs> FTy->getNumParams()))&&
>>> "Invoking 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=99399&r1=99398&r2=99399&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/Verifier.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/Verifier.cpp Wed Mar 24 08:21:49 2010
>>> @@ -676,17 +676,13 @@
>>> "blockaddress may not be used with the entry block!",
>>> Entry);
>>> }
>>> }
>>> -
>>> +
>>> // If this function is actually an intrinsic, verify that it is only
>>> used in
>>> // direct call/invokes, never having its "address taken".
>>> if (F.getIntrinsicID()) {
>>> - for (Value::use_iterator UI = F.use_begin(), E = F.use_end(); UI !=
>>> E;++UI){
>>> - User *U = cast<User>(UI);
>>> - if ((isa<CallInst>(U) || isa<InvokeInst>(U))&& UI.getOperandNo()
>>> == 0)
>>> - continue; // Direct calls/invokes are ok.
>>> -
>>> + const User *U;
>>> + if (F.hasAddressTaken(&U))
>>> Assert1(0, "Invalid user of intrinsic instruction!", U);
>>> - }
>>> }
>>> }
>>>
>>> @@ -1483,7 +1479,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