From de85ad895d943e4fdd6e4384b26ce0e489e37ec9 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka@google.com>
Date: Wed, 15 Mar 2017 23:06:22 +0000
Subject: [PATCH] Revert "[PGO] Minor cleanup for count instruction in
 SelectInstVisitor."

Fails LLVMFuzzer.LLVMFuzzer.value-profile-strncmp.test

This reverts commit r297892.

llvm-svn: 297910
---
 llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
index d9c25f2e9815..258b77c8addb 100644
--- a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
+++ b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp
@@ -205,7 +205,6 @@ struct SelectInstVisitor : public InstVisitor<SelectInstVisitor> {
   SelectInstVisitor(Function &Func) : F(Func) {}
 
   void countSelects(Function &Func) {
-    NSIs = 0;
     Mode = VM_counting;
     visit(Func);
   }
@@ -235,8 +234,6 @@ struct SelectInstVisitor : public InstVisitor<SelectInstVisitor> {
   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; }
 };
 
@@ -1107,9 +1104,9 @@ void SelectInstVisitor::visitSelectInst(SelectInst &SI) {
   if (SI.getCondition()->getType()->isVectorTy())
     return;
 
+  NSIs++;
   switch (Mode) {
   case VM_counting:
-    NSIs++;
     return;
   case VM_instrument:
     instrumentOneSelectInst(SI);
-- 
GitLab