[InstrProfiling] Don't exit early when an unused intrinsic is found

This fixes a think-o in r323574.

llvm-svn: 323576

2 files changed, 21 insertions, 3 deletions

diff --git a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
index fcc07ee4555..40d25893047 100644
--- a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
+++ b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
@@ -434,13 +434,16 @@ void InstrProfiling::promoteCounterLoadStores(Function *F) {
 static bool containsProfilingIntrinsics(Module &M) {
   if (auto *F = M.getFunction(
           Intrinsic::getName(llvm::Intrinsic::instrprof_increment)))
-    return !F->use_empty();
+    if (!F->use_empty())
+      return true;
   if (auto *F = M.getFunction(
           Intrinsic::getName(llvm::Intrinsic::instrprof_increment_step)))
-    return !F->use_empty();
+    if (!F->use_empty())
+      return true;
   if (auto *F = M.getFunction(
           Intrinsic::getName(llvm::Intrinsic::instrprof_value_profile)))
-    return !F->use_empty();
+    if (!F->use_empty())
+      return true;
   return false;
 }
 
diff --git a/llvm/test/Instrumentation/InstrProfiling/early-exit.ll b/llvm/test/Instrumentation/InstrProfiling/early-exit.ll
new file mode 100644
index 00000000000..bc19fbd8155
--- /dev/null
+++ b/llvm/test/Instrumentation/InstrProfiling/early-exit.ll
@@ -0,0 +1,15 @@
+; RUN: opt < %s -instrprof -S | FileCheck %s
+
+target triple = "x86_64-apple-macosx10.10.0"
+
+declare void @llvm.instrprof.increment(i8*, i64, i32, i32)
+
+declare void @llvm.instrprof.increment.step(i8*, i64, i32, i32, i64)
+
+@__profn_foo = hidden constant [3 x i8] c"foo"
+
+define void @foo() {
+; CHECK: @__profc_foo = hidden global [1 x i64] zeroinitializer, section "__DATA,__llvm_prf_cnts", align 8
+  call void @llvm.instrprof.increment.step(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @__profn_foo, i32 0, i32 0), i64 0, i32 1, i32 0, i64 0)
+  ret void
+}