commit ce7de9b6fba73a938c80d6dbb737c48be6e8f7dc
author Teresa Johnson <tejohnson@google.com> Sun Jul 17 14:46:58 2016 +0000
committer Teresa Johnson <tejohnson@google.com> Sun Jul 17 14:46:58 2016 +0000
tree 7d22ec0e3ba14c4de6cf98923ca4729d62319284
parent 3f4219865214f689c9e9e69bda1279aec72440f9

Address review comments.

llvm-svn: 275706

llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp

diff --git a/llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp b/llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp
index 1b1761d..202b94b 100644
--- a/llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp
+++ b/llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp
@@ -275,6 +275,14 @@
     DEBUG(dbgs() << " Candidate " << I << " Count=" << Count
                  << "  Target_func: " << Target << "\n");
 
+    if (ICPInvokeOnly && dyn_cast<CallInst>(Inst)) {
+      DEBUG(dbgs() << " Not promote: User options.\n");
+      break;
+    }
+    if (ICPCallOnly && dyn_cast<InvokeInst>(Inst)) {
+      DEBUG(dbgs() << " Not promote: User option.\n");
+      break;
+    }
     if (ICPCutOff != 0 && NumOfPGOICallPromotion >= ICPCutOff) {
       DEBUG(dbgs() << " Not promote: Cutoff reached.\n");
       break;