Move body of ifacmpneSimplifier to new helper

In this commit, the helper is only called from the
ifacmpneSimplifier itself, so that there is no functional change.

compiler/optimizer/OMRSimplifierHandlers.cpp

@@ -13994,31 +13994,18 @@ TR::Node *normalizeCmpSimplifier(TR::Node * node, TR::Block * block, TR::Simplif
    return node;
    }
 
-//---------------------------------------------------------------------
-// Address if compare equal
-//
-
-TR::Node *ifacmpeqSimplifier(TR::Node * node, TR::Block * block, TR::Simplifier * s)
+static TR::Node *simplifyIfacmpneHelper(TR::Node * node, TR::Block * block, TR::Simplifier * s)
    {
-   // Perform a simplification for the case where an iselect is compared to a
-   // constant. This is done before simplifyChildren because it may allow
-   // further transformations to be done on the children.
-   simplifyISelectCompare(node, s);
-
-   if (removeIfToFollowingBlock(node, block, s) == NULL)
-      return NULL;
-   s->simplifyChildren(node, block);
-
    TR::Node * firstChild = node->getFirstChild(), * secondChild = node->getSecondChild();
 
    if (firstChild == secondChild)
       {
-      s->conditionalToUnconditional(node, block, true);
+      s->conditionalToUnconditional(node, block, false);
       return node;
       }
 
    makeConstantTheRightChild(node, firstChild, secondChild, s);
-   if (firstChild->getOpCodeValue() == TR::aconst && conditionalBranchFold((firstChild->getAddress()==secondChild->getAddress()), node, firstChild, secondChild, block, s))
+   if (firstChild->getOpCodeValue() == TR::aconst && conditionalBranchFold((firstChild->getAddress()!=secondChild->getAddress()), node, firstChild, secondChild, block, s))
       return node;
 
    // weak symbols aren't necessarily defined, so we have to do the test
@@ -14034,9 +14021,10 @@ TR::Node *ifacmpeqSimplifier(TR::Node * node, TR::Block * block, TR::Simplifier
    }
 
 //---------------------------------------------------------------------
-// Address if compare not equal
+// Address if compare equal
 //
-TR::Node *ifacmpneSimplifier(TR::Node * node, TR::Block * block, TR::Simplifier * s)
+
+TR::Node *ifacmpeqSimplifier(TR::Node * node, TR::Block * block, TR::Simplifier * s)
    {
    // Perform a simplification for the case where an iselect is compared to a
    // constant. This is done before simplifyChildren because it may allow
@@ -14051,12 +14039,12 @@ TR::Node *ifacmpneSimplifier(TR::Node * node, TR::Block * block, TR::Simplifier
 
    if (firstChild == secondChild)
       {
-      s->conditionalToUnconditional(node, block, false);
+      s->conditionalToUnconditional(node, block, true);
       return node;
       }
 
    makeConstantTheRightChild(node, firstChild, secondChild, s);
-   if (firstChild->getOpCodeValue() == TR::aconst && conditionalBranchFold((firstChild->getAddress()!=secondChild->getAddress()), node, firstChild, secondChild, block, s))
+   if (firstChild->getOpCodeValue() == TR::aconst && conditionalBranchFold((firstChild->getAddress()==secondChild->getAddress()), node, firstChild, secondChild, block, s))
       return node;
 
    // weak symbols aren't necessarily defined, so we have to do the test
@@ -14071,6 +14059,23 @@ TR::Node *ifacmpneSimplifier(TR::Node * node, TR::Block * block, TR::Simplifier
    return node;
    }
 
+//---------------------------------------------------------------------
+// Address if compare not equal
+//
+TR::Node *ifacmpneSimplifier(TR::Node * node, TR::Block * block, TR::Simplifier * s)
+   {
+   // Perform a simplification for the case where an iselect is compared to a
+   // constant. This is done before simplifyChildren because it may allow
+   // further transformations to be done on the children.
+   simplifyISelectCompare(node, s);
+
+   if (removeIfToFollowingBlock(node, block, s) == NULL)
+      return NULL;
+   s->simplifyChildren(node, block);
+
+   return simplifyIfacmpneHelper(node, block, s);
+   }
+
 //---------------------------------------------------------------------
 // If compares that include equality
 //