diff options
| author | Gabor Greif <ggreif@gmail.com> | 2010-03-24 13:21:49 +0000 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2010-03-24 13:21:49 +0000 |
| commit | c9f7500d1752feac7cece26d20007a99d21f677c (patch) | |
| tree | 855c74f792cd3e5ba272a2a73df5a17feb2729ab /lib/Transforms/Scalar/SCCP.cpp | |
| parent | 6d6aaeca4f50e1ce101b71b33a52cbd66db01c52 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99399 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Scalar/SCCP.cpp')
| -rw-r--r-- | lib/Transforms/Scalar/SCCP.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index e28478c256..aa63ca72cc 100644 --- a/lib/Transforms/Scalar/SCCP.cpp +++ b/lib/Transforms/Scalar/SCCP.cpp @@ -1717,7 +1717,8 @@ static bool AddressIsTaken(const GlobalValue *GV) { 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()) |