Use use_iterator::getOperandNo instead of CallSite::hasArgument to check if a

function is passed as an argument instead of called. Also do this check a bit
earlier.

llvm-svn: 51990

1 files changed, 6 insertions, 7 deletions

diff --git a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp b/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
index 2f075ba30dc..604a1483c45 100644
--- a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
+++ b/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
@@ -302,6 +302,12 @@ void DAE::SurveyFunction(Function &F) {
     FunctionIntrinsicallyLive = true;
   else
     for (Value::use_iterator I = F.use_begin(), E = F.use_end(); I != E; ++I) {
+      // If the function is PASSED IN as an argument, its address has been taken
+      if (I.getOperandNo() != 0) {
+        FunctionIntrinsicallyLive = true;
+        break;
+      }
+
       // If this use is anything other than a call site, the function is alive.
       CallSite CS = CallSite::get(*I);
       Instruction *TheCall = CS.getInstruction();
@@ -329,13 +335,6 @@ void DAE::SurveyFunction(Function &F) {
             RetValLiveness = Live;
             break;
           }
-
-      // If the function is PASSED IN as an argument, its address has been taken
-      
-      if (CS.hasArgument(&F)) {
-        FunctionIntrinsicallyLive = true;
-        break;
-      }
     }
 
   if (FunctionIntrinsicallyLive) {