Remove deprecated GlobalAllocator

Signed-off-by: Daryl Maier <maier@ca.ibm.com>
eclipse · Feb 14, 2021 · 33b3bc7 · 33b3bc7
1 parent 64dbab2
commit 33b3bc7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/compiler/env/FEBase.hpp b/compiler/env/FEBase.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2020 IBM Corp. and others
+ * Copyright (c) 2000, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -74,7 +74,7 @@ class FEBase : public FECommon
    JitConfig            _config;
    TR::CodeCacheManager _codeCacheManager;
 
-   // these two are deprecated in favour of TR::GlobalAllocator and TR::Allocator
+   // this is deprecated in favour of TR::Allocator
    TR_PersistentMemory       _persistentMemory; // global memory
 
    public:

diff --git a/compiler/env/TRMemory.hpp b/compiler/env/TRMemory.hpp
@@ -1029,22 +1029,12 @@ namespace TR
       static GlobalSingletonAllocator *_instance;
       };
 
-   typedef CS2::shared_allocator < GlobalSingletonAllocator > GlobalAllocator;
-
-   static GlobalAllocator globalAllocator(const char *name = NULL)
-      {
-      return GlobalAllocator(GlobalSingletonAllocator::instance());
-      }
-
    /*
     * some common CS2 datatypes
     */
    typedef CS2::ASparseBitVector<TR::Allocator> SparseBitVector;
    typedef CS2::ABitVector<TR::Allocator>       BitVector;
 
-   typedef CS2::ASparseBitVector<TR::GlobalAllocator> GlobalSparseBitVector;
-   typedef CS2::ABitVector<TR::GlobalAllocator>       GlobalBitVector;
-
    class AllocatedMemoryMeter
       {
       private:

diff --git a/compiler/optimizer/UseDefInfo.cpp b/compiler/optimizer/UseDefInfo.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corp. and others
+ * Copyright (c) 2000, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -1711,7 +1711,7 @@ void TR_UseDefInfo::insertData(TR::Block *block, TR::Node *node,TR::Node *parent
          aux._defsForSymbol[j]->set(k);
          aux._expandedAtoms[k] = std::make_pair(node, treeTop);
          }
-      TR::GlobalSparseBitVector *mustKill = NULL;
+
       TR::Symbol *callSym = NULL;
       TR::Method *callMethod = NULL;