Merge pull request #4679 from AidanHa/Issue4649

Add TR::Region::reset helper function
eclipse-openj9 · Jan 9, 2020 · 85fd3d4 · 85fd3d4
2 parents 254885c + 071ded8
commit 85fd3d4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/compiler/compile/OMRCompilation.cpp b/compiler/compile/OMRCompilation.cpp
@@ -2722,8 +2722,7 @@ void OMR::Compilation::invalidateAliasRegion()
    {
    if (self()->_aliasRegion.bytesAllocated() > (ALIAS_REGION_LOAD_FACTOR) * TR::Region::initialSize())
       {
-      self()->_aliasRegion.~Region();
-      new (&self()->_aliasRegion) TR::Region(_heapMemoryRegion);
+      TR::Region::reset(self()->_aliasRegion, _heapMemoryRegion);
       }
    }
 

diff --git a/compiler/env/Region.hpp b/compiler/env/Region.hpp
@@ -113,6 +113,12 @@ class Region
 
    void deallocate(void * allocation, size_t = 0) throw();
 
+   static void reset(TR::Region& targetRegion, TR::Region& prototypeRegion)
+      {
+      targetRegion.~Region(); 
+      new (&targetRegion) TR::Region(prototypeRegion);
+      }
+
    friend bool operator ==(const TR::Region &lhs, const TR::Region &rhs)
       {
       return &lhs == &rhs;

diff --git a/compiler/il/NodePool.cpp b/compiler/il/NodePool.cpp
@@ -41,8 +41,7 @@ TR::NodePool::NodePool(TR::Compilation * comp, const TR::Allocator &allocator) :
 void
 TR::NodePool::cleanUp()
    {
-   _nodeRegion.~Region();
-   new (&_nodeRegion) TR::Region(_comp->trMemory()->heapMemoryRegion());
+   TR::Region::reset(_nodeRegion, _comp->trMemory()->heapMemoryRegion());
    }
 
 TR::Node *

diff --git a/compiler/infra/OMRCfg.cpp b/compiler/infra/OMRCfg.cpp
@@ -326,8 +326,7 @@ TR_Structure *
 OMR::CFG::invalidateStructure()
    {
    setStructure(NULL);
-   _structureRegion.~Region();
-   new (&_structureRegion) TR::Region(comp()->trMemory()->heapMemoryRegion());
+   TR::Region::reset(_structureRegion, comp()->trMemory()->heapMemoryRegion());
    return getStructure();
    }
 

diff --git a/compiler/optimizer/RegisterCandidate.hpp b/compiler/optimizer/RegisterCandidate.hpp
@@ -349,8 +349,7 @@ class TR_RegisterCandidates
    TR_RegisterCandidate *newCandidate(TR::SymbolReference *ref);
 
    void releaseCandidates() {
-     _candidateRegion.~Region();
-     new (_candidateRegion) TR::Region(_trMemory->heapMemoryRegion());
+      TR::Region::reset(_candidateRegion, _trMemory->heapMemoryRegion());
    }
 
    void collectCfgProperties(TR::Block **, int32_t);