The actual nicification of calls is now implemented in instcombine, not in
funcresolve


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6784 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll b/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll
index 93997cf..a0dab65 100644
--- a/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll
+++ b/test/Transforms/FunctionResolve/2002-11-09-ExternFn.ll
@@ -3,7 +3,7 @@
 ; RUN: else exit 1   # Make sure opt doesn't abort!
 ; RUN: fi
 ;
-; RUN: if as < %s | opt -funcresolve | dis | grep '\.\.\.'
+; RUN: if as < %s | opt -funcresolve -instcombine | dis | grep '\.\.\.'
 ; RUN: then exit 1
 ; RUN: else exit 0
 ; RUN: fi
diff --git a/test/Transforms/FunctionResolve/basictest.ll b/test/Transforms/FunctionResolve/basictest.ll
index c21142d..422b655 100644
--- a/test/Transforms/FunctionResolve/basictest.ll
+++ b/test/Transforms/FunctionResolve/basictest.ll
@@ -1,4 +1,4 @@
-; RUN: if as < %s | opt -funcresolve | dis | grep '\.\.\.' | grep call
+; RUN: if as < %s | opt -funcresolve -instcombine | dis | grep '\.\.\.' | grep call
 ; RUN: then exit 1
 ; RUN: else exit 0
 ; RUN: fi
diff --git a/test/Transforms/FunctionResolve/retmismatch1.ll b/test/Transforms/FunctionResolve/retmismatch1.ll
index aeca7af..fe684d1 100644
--- a/test/Transforms/FunctionResolve/retmismatch1.ll
+++ b/test/Transforms/FunctionResolve/retmismatch1.ll
@@ -5,7 +5,7 @@
 ; RUN: else exit 1   # Make sure opt doesn't abort!
 ; RUN: fi
 ;
-; RUN: if as < %s | opt -funcresolve | dis | grep '\.\.\.' | grep call
+; RUN: if as < %s | opt -funcresolve -instcombine | dis | grep '\.\.\.' | grep call
 ; RUN: then exit 1
 ; RUN: else exit 0
 ; RUN: fi
diff --git a/test/Transforms/FunctionResolve/retmismatch2.ll b/test/Transforms/FunctionResolve/retmismatch2.ll
index 1c552ed..cffe1a4 100644
--- a/test/Transforms/FunctionResolve/retmismatch2.ll
+++ b/test/Transforms/FunctionResolve/retmismatch2.ll
@@ -6,7 +6,7 @@
 ; RUN: else exit 1   # Make sure opt doesn't abort!
 ; RUN: fi
 ;
-; RUN: if as < %s | opt -funcresolve | dis | grep '\.\.\.' | grep call
+; RUN: if as < %s | opt -funcresolve -instcombine | dis | grep '\.\.\.' | grep call
 ; RUN: then exit 1
 ; RUN: else exit 0
 ; RUN: fi