From f70760896c7a5d5f2b286d9ea71c8b6d90e98625 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Tue, 1 Mar 2022 19:21:31 +0100
Subject: Revert "Merge branch 'newpm2' into dev"

This reverts commit fee1acf7e6096533f1aa8cd74035bed21c90fdf6, reversing
changes made to 675d17d737ee5dee88766d9c181567771592c94c.
---
 instrumentation/cmplog-instructions-pass.cc | 37 +++--------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

(limited to 'instrumentation/cmplog-instructions-pass.cc')

diff --git a/instrumentation/cmplog-instructions-pass.cc b/instrumentation/cmplog-instructions-pass.cc
index b6d51ef3..310f5585 100644
--- a/instrumentation/cmplog-instructions-pass.cc
+++ b/instrumentation/cmplog-instructions-pass.cc
@@ -28,16 +28,11 @@
 #include "llvm/Config/llvm-config.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/LegacyPassManager.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#if LLVM_MAJOR >= 11
-//  #include "llvm/Passes/PassPlugin.h"
-//  #include "llvm/Passes/PassBuilder.h"
-  #include "llvm/IR/PassManager.h"
-#else
-  #include "llvm/IR/LegacyPassManager.h"
-#endif
+#include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Pass.h"
 #include "llvm/Analysis/ValueTracking.h"
@@ -60,15 +55,6 @@ using namespace llvm;
 
 namespace {
 
-#if LLVM_MAJOR >= 11           /* use new pass manager */
-class CmpLogInstructions : public PassInfoMixin<CmpLogInstructions> {
- public:
-  CmpLogInstructions() {
-
-    initInstrumentList();
-
-  }
-#else
 class CmpLogInstructions : public ModulePass {
 
  public:
@@ -78,11 +64,7 @@ class CmpLogInstructions : public ModulePass {
     initInstrumentList();
 
   }
-#endif
 
-#if LLVM_MAJOR >= 11           /* use new pass manager */
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
-#else
   bool runOnModule(Module &M) override;
 
 #if LLVM_VERSION_MAJOR >= 4
@@ -95,7 +77,6 @@ class CmpLogInstructions : public ModulePass {
     return "cmplog instructions";
 
   }
-#endif
 
  private:
   bool hookInstrs(Module &M);
@@ -104,9 +85,7 @@ class CmpLogInstructions : public ModulePass {
 
 }  // namespace
 
-#if LLVM_MAJOR <= 10           /* use old pass manager */
 char CmpLogInstructions::ID = 0;
-#endif
 
 template <class Iterator>
 Iterator Unique(Iterator first, Iterator last) {
@@ -634,12 +613,7 @@ bool CmpLogInstructions::hookInstrs(Module &M) {
 
 }
 
-#if LLVM_MAJOR >= 11           /* use new pass manager */
-PreservedAnalyses CmpLogInstructions::run(Module &               M,
-                                              ModuleAnalysisManager &MAM) {
-#else
 bool CmpLogInstructions::runOnModule(Module &M) {
-#endif
 
   if (getenv("AFL_QUIET") == NULL)
     printf("Running cmplog-instructions-pass by andreafioraldi@gmail.com\n");
@@ -648,15 +622,10 @@ bool CmpLogInstructions::runOnModule(Module &M) {
   hookInstrs(M);
   verifyModule(M);
 
-#if LLVM_MAJOR >= 11           /* use new pass manager */
-  return PreservedAnalyses::all();
-#else
   return true;
-#endif
 
 }
 
-#if LLVM_MAJOR < 11                                 /* use old pass manager */
 static void registerCmpLogInstructionsPass(const PassManagerBuilder &,
                                            legacy::PassManagerBase &PM) {
 
@@ -676,4 +645,4 @@ static RegisterStandardPasses RegisterCmpLogInstructionsPassLTO(
     PassManagerBuilder::EP_FullLinkTimeOptimizationLast,
     registerCmpLogInstructionsPass);
 #endif
-#endif
+
-- 
cgit 1.4.1