Do not swing down volatile nodes

Volatile nodes should always be anchored under a treetop to avoid any interference with other optimization passes (e.g. PRE). Fixes eclipse-openj9/openj9#18777 Signed-off-by: Annabelle Huo <[email protected]>
eclipse-omr · Mar 6, 2024 · 704da43 · 704da43
1 parent ed9d073
commit 704da43
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/compiler/optimizer/DeadTreesElimination.cpp b/compiler/optimizer/DeadTreesElimination.cpp
@@ -265,6 +265,9 @@ static bool isSafeToReplaceNode(TR::Node *currentNode, TR::TreeTop *curTreeTop,
       return false;
 
    bool mayBeVolatileReference = currentNode->mightHaveVolatileSymbolReference();
+   // Do not swing down volatile nodes
+   if (mayBeVolatileReference)
+      return false;
 
    // Now scan forwards through the trees looking for the next use and checking
    // to see if any symbols in the subtree are getting modified; if so it is not
@@ -303,8 +306,8 @@ static bool isSafeToReplaceNode(TR::Node *currentNode, TR::TreeTop *curTreeTop,
        *    => xload/xloadi a.volatileField
        *    ...
        */
-      if (mayBeVolatileReference && !canMoveIfVolatile)
-         return false;
+      //if (mayBeVolatileReference && !canMoveIfVolatile)
+      //   return false;
 
       if (nodeInSubTree)
          {