<div dir="ltr">Sorry about this noisy commit! I didn't properly merge together all the git revisions on my branch before committing D21932/r275707. This and the other mistake commit r275705 cancel each other out.<div class="gmail_extra"><br><div class="gmail_quote">On Sun, Jul 17, 2016 at 7:46 AM, Teresa Johnson via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">Author: tejohnson<br>
Date: Sun Jul 17 09:46:58 2016<br>
New Revision: 275706<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=275706&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=275706&view=rev</a><br>
Log:<br>
Address review comments.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp<br>
<br>
Modified: llvm/trunk/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp?rev=275706&r1=275705&r2=275706&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp?rev=275706&r1=275705&r2=275706&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp Sun Jul 17 09:46:58 2016<br>
@@ -275,6 +275,14 @@ ICallPromotionFunc::getPromotionCandidat<br>
     DEBUG(dbgs() << " Candidate " << I << " Count=" << Count<br>
                  << "  Target_func: " << Target << "\n");<br>
<br>
+    if (ICPInvokeOnly && dyn_cast<CallInst>(Inst)) {<br>
+      DEBUG(dbgs() << " Not promote: User options.\n");<br>
+      break;<br>
+    }<br>
+    if (ICPCallOnly && dyn_cast<InvokeInst>(Inst)) {<br>
+      DEBUG(dbgs() << " Not promote: User option.\n");<br>
+      break;<br>
+    }<br>
     if (ICPCutOff != 0 && NumOfPGOICallPromotion >= ICPCutOff) {<br>
       DEBUG(dbgs() << " Not promote: Cutoff reached.\n");<br>
       break;<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div><span style="font-family:times;font-size:medium"><table cellspacing="0" cellpadding="0"><tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small"><td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Teresa Johnson |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tejohnson@google.com" target="_blank">tejohnson@google.com</a> |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"> <a href="tel:408-460-2413" value="+14084602413" target="_blank">408-460-2413</a></td></tr></tbody></table></span></div>
</div></div>