Add unsafe symrefs arrays for all access modes

This change adds arrays for opaque and acquire/release unsafe symrefs to the symbol reference table. Instead of having four separate fields, the fields are combined into an array that can be indexed by the OMR::Symbol::AccessMode enum. Signed-off-by: Spencer Comin <[email protected]>
eclipse-omr · Nov 25, 2024 · c115927 · c115927
1 parent 0375fc5
commit c115927
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/compiler/compile/OMRSymbolReferenceTable.cpp b/compiler/compile/OMRSymbolReferenceTable.cpp
@@ -102,8 +102,7 @@ OMR::SymbolReferenceTable::SymbolReferenceTable(size_t sizeHint, TR::Compilation
      _numInternalPointers(0),
      _ObjectNewInstanceImplSymRef(0),
      _knownObjectSymrefsByObjectIndex(comp->trMemory()),
-     _unsafeSymRefs(0),
-     _unsafeVolatileSymRefs(0),
+     _unsafeSymRefs{},
      _availableAutos(comp->trMemory()),
      _vtableEntrySymbolRefs(comp->trMemory()),
      _classLoaderSymbolRefs(comp->trMemory()),

diff --git a/compiler/compile/OMRSymbolReferenceTable.hpp b/compiler/compile/OMRSymbolReferenceTable.hpp
@@ -941,8 +941,7 @@ class SymbolReferenceTable
 
    TR_Array<TR_BitVector *>            _knownObjectSymrefsByObjectIndex;
 
-   TR_Array<TR::SymbolReference *> *    _unsafeSymRefs;
-   TR_Array<TR::SymbolReference *> *    _unsafeVolatileSymRefs;
+   TR_Array<TR::SymbolReference *> *    _unsafeSymRefs[TR::Symbol::LastMemoryOrdering+1];
 
    List<TR::SymbolReference>            _availableAutos;
    List<TR::SymbolReference>            _vtableEntrySymbolRefs;