Ensure isInternalPointer can be called for both store nodes

The simplifyBooleanStore method of CFG Simplifier tries to determine
whether two stores in different blocks update the same location based on
a boolean condition.  One of the conditions considers whether either
store is storing an internal pointer.  However, the code only tested
whether the first of the two stores was indirect before deciding whether
the first child or second child of both stores needed to have its
isInternalPointer flag tested.  If the first store was indirect, but the
second was direct, that would result in a non-existent second child of
the second store being accessed.  Similarly, if the first store was
direct, but the second was indirect, the first child of the second store
would be accessed, rather than the child representing the value to be
stored.

This change fixes this problem by moving the code that performs these
tests after a test of whether the two stores use the same opcode value.
At that point, the stores must both be direct stores or both be indirect
stores, so the same child index of each will need to have its
isInternalPointer flag tested.

Signed-off-by:  Henry Zongaro <[email protected]>

Author: hzongaro

compiler/optimizer/OMRCFGSimplifier.cpp

@@ -1150,16 +1150,6 @@ bool OMR::CFGSimplifier::simplifyBooleanStore(bool needToDuplicateTree)
     if (trace())
         traceMsg(comp(), "   Successor block_%d is single store\n", _next2->getNumber());
 
-    // Store values cannot be internal pointers
-    //
-    int32_t valueIndex = store1->getOpCode().isIndirect() ? 1 : 0;
-    TR::Node *value1 = store1->getChild(valueIndex);
-    TR::Node *value2 = store2->getChild(valueIndex);
-    if (value1->isInternalPointer() || value2->isInternalPointer())
-        return false;
-    if (trace())
-        traceMsg(comp(), "   Store values are not internal pointers\n");
-
     // The stores must be integer stores to the same variable
     //
     if (store1->getOpCodeValue() != store2->getOpCodeValue())
@@ -1171,6 +1161,17 @@ bool OMR::CFGSimplifier::simplifyBooleanStore(bool needToDuplicateTree)
     if (trace())
         traceMsg(comp(), "   Store nodes opcode and symref checks out\n");
 
+    // Store values cannot be internal pointers
+    //
+    int32_t valueIndex = store1->getOpCode().isIndirect() ? 1 : 0;
+    TR::Node *value1 = store1->getChild(valueIndex);
+    TR::Node *value2 = store2->getChild(valueIndex);
+    if (value1->isInternalPointer() || value2->isInternalPointer())
+        return false;
+    if (trace())
+        traceMsg(comp(), "   Store values are not internal pointers\n");
+
+
     // Indirect stores must have the same base
     //
     if (valueIndex == 1) // indirect store, check base objects