[llvm] r297911 - Revert "Revert "[PGO] Minor cleanup for count instruction in SelectInstVisitor.""

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Wed Mar 15 18:07:41 2017
New Revision: 297911

URL: http://llvm.org/viewvc/llvm-project?rev=297911&view=rev
Log:
Revert "Revert "[PGO] Minor cleanup for count instruction in SelectInstVisitor.""

Previously reverted wrong revision.

This reverts commit r297910.

Modified:
    llvm/trunk/lib/Transforms/Instrumentation/PGOInstrumentation.cpp

Modified: llvm/trunk/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/PGOInstrumentation.cpp?rev=297911&r1=297910&r2=297911&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/PGOInstrumentation.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/PGOInstrumentation.cpp Wed Mar 15 18:07:41 2017
@@ -205,6 +205,7 @@ struct SelectInstVisitor : public InstVi
   SelectInstVisitor(Function &Func) : F(Func) {}
 
   void countSelects(Function &Func) {
+    NSIs = 0;
     Mode = VM_counting;
     visit(Func);
   }
@@ -234,6 +235,8 @@ struct SelectInstVisitor : public InstVi
   void annotateOneSelectInst(SelectInst &SI);
   // Visit \p SI instruction and perform tasks according to visit mode.
   void visitSelectInst(SelectInst &SI);
+  // Return the number of select instructions. This needs be called after
+  // countSelects().
   unsigned getNumOfSelectInsts() const { return NSIs; }
 };
 
@@ -1104,9 +1107,9 @@ void SelectInstVisitor::visitSelectInst(
   if (SI.getCondition()->getType()->isVectorTy())
     return;
 
-  NSIs++;
   switch (Mode) {
   case VM_counting:
+    NSIs++;
     return;
   case VM_instrument:
     instrumentOneSelectInst(SI);