From 2f128e0dbd1b39f1d99a042f8813b93da1747731 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Mon, 6 Mar 2023 10:13:35 +0100
Subject: Revert "Merge pull request #1665 from devnexen/llvm_inst_mem_leaks"

This reverts commit e5f8c7a6129e42d1798fac1131c912b2eca8159c, reversing
changes made to e6a05382b83817b245da51bcba16be5df56eb283.
---
 instrumentation/cmplog-instructions-pass.cc | 2 +-
 instrumentation/cmplog-routines-pass.cc     | 2 +-
 instrumentation/cmplog-switches-pass.cc     | 2 +-
 instrumentation/split-compares-pass.so.cc   | 2 +-
 instrumentation/split-switches-pass.so.cc   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/instrumentation/cmplog-instructions-pass.cc b/instrumentation/cmplog-instructions-pass.cc
index 7dcf8bfa..bca1f927 100644
--- a/instrumentation/cmplog-instructions-pass.cc
+++ b/instrumentation/cmplog-instructions-pass.cc
@@ -66,7 +66,7 @@ namespace {
 
 #if LLVM_MAJOR >= 11                                /* use new pass manager */
 class CmpLogInstructions : public PassInfoMixin<CmpLogInstructions> {
-  llvm_shutdown_obj LSO;
+
  public:
   CmpLogInstructions() {
 
diff --git a/instrumentation/cmplog-routines-pass.cc b/instrumentation/cmplog-routines-pass.cc
index c2c52874..0498156d 100644
--- a/instrumentation/cmplog-routines-pass.cc
+++ b/instrumentation/cmplog-routines-pass.cc
@@ -63,7 +63,7 @@ namespace {
 
 #if LLVM_VERSION_MAJOR >= 11                        /* use new pass manager */
 class CmpLogRoutines : public PassInfoMixin<CmpLogRoutines> {
-  llvm_shutdown_obj LSO;
+
  public:
   CmpLogRoutines() {
 
diff --git a/instrumentation/cmplog-switches-pass.cc b/instrumentation/cmplog-switches-pass.cc
index d96c5a4f..cd0ae76d 100644
--- a/instrumentation/cmplog-switches-pass.cc
+++ b/instrumentation/cmplog-switches-pass.cc
@@ -64,7 +64,7 @@ namespace {
 
 #if LLVM_VERSION_MAJOR >= 11                        /* use new pass manager */
 class CmplogSwitches : public PassInfoMixin<CmplogSwitches> {
-  llvm_shutdown_obj LSO;
+
  public:
   CmplogSwitches() {
 
diff --git a/instrumentation/split-compares-pass.so.cc b/instrumentation/split-compares-pass.so.cc
index a189c203..8a07610c 100644
--- a/instrumentation/split-compares-pass.so.cc
+++ b/instrumentation/split-compares-pass.so.cc
@@ -66,7 +66,7 @@ namespace {
 
 #if LLVM_MAJOR >= 11
 class SplitComparesTransform : public PassInfoMixin<SplitComparesTransform> {
-  llvm_shutdown_obj LSO;
+
  public:
   //  static char ID;
   SplitComparesTransform() : enableFPSplit(0) {
diff --git a/instrumentation/split-switches-pass.so.cc b/instrumentation/split-switches-pass.so.cc
index 1028c5b0..dcd89652 100644
--- a/instrumentation/split-switches-pass.so.cc
+++ b/instrumentation/split-switches-pass.so.cc
@@ -65,7 +65,7 @@ namespace {
 
 #if LLVM_VERSION_MAJOR >= 11                        /* use new pass manager */
 class SplitSwitchesTransform : public PassInfoMixin<SplitSwitchesTransform> {
-  llvm_shutdown_obj LSO;
+
  public:
   SplitSwitchesTransform() {
 
-- 
cgit 1.4.1