Implement reviewer suggestions

Author: ritter-x2a

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

@@ -2650,7 +2650,7 @@ SDValue DAGCombiner::visitPTRADD(SDNode *N) {
     return N0;
 
   // fold (ptradd 0, x) -> x
-  if (isNullConstant(N0) && PtrVT == IntVT)
+  if (PtrVT == IntVT && isNullConstant(N0))
     return N1;
 
   if (N0.getOpcode() != ISD::PTRADD ||
@@ -2668,10 +2668,9 @@ SDValue DAGCombiner::visitPTRADD(SDNode *N) {
   //   * y is a constant and (ptradd x, y) has one use; or
   //   * y and z are both constants.
   if ((YIsConstant && N0OneUse) || (YIsConstant && ZIsConstant)) {
-    SDNodeFlags Flags;
     // If both additions in the original were NUW, the new ones are as well.
-    if (N->getFlags().hasNoUnsignedWrap() && N0->getFlags().hasNoUnsignedWrap())
-      Flags |= SDNodeFlags::NoUnsignedWrap;
+    SDNodeFlags Flags =
+        (N->getFlags() & N0->getFlags()) & SDNodeFlags::NoUnsignedWrap;
     SDValue Add = DAG.getNode(ISD::ADD, DL, IntVT, {Y, Z}, Flags);
     AddToWorklist(Add.getNode());
     return DAG.getMemBasePlusOffset(X, Add, DL, Flags);

llvm/lib/Target/AMDGPU/SIISelLowering.cpp

@@ -14968,22 +14968,20 @@ SDValue SITargetLowering::performPtrAddCombine(SDNode *N,
     SDValue X = N0;
     SDValue Y = N1.getOperand(0);
     SDValue Z = N1.getOperand(1);
-    bool N1OneUse = N1.hasOneUse();
-    bool YIsConstant = DAG.isConstantIntBuildVectorOrConstantInt(Y);
-    bool ZIsConstant = DAG.isConstantIntBuildVectorOrConstantInt(Z);
-    if ((ZIsConstant != YIsConstant) && N1OneUse) {
-      SDNodeFlags Flags;
-      // If both additions in the original were NUW, the new ones are as well.
-      if (N->getFlags().hasNoUnsignedWrap() &&
-          N1->getFlags().hasNoUnsignedWrap())
-        Flags |= SDNodeFlags::NoUnsignedWrap;
-
-      if (YIsConstant)
-        std::swap(Y, Z);
-
-      SDValue Inner = DAG.getMemBasePlusOffset(X, Y, DL, Flags);
-      DCI.AddToWorklist(Inner.getNode());
-      return DAG.getMemBasePlusOffset(Inner, Z, DL, Flags);
+    if (N1.hasOneUse()) {
+      bool YIsConstant = DAG.isConstantIntBuildVectorOrConstantInt(Y);
+      bool ZIsConstant = DAG.isConstantIntBuildVectorOrConstantInt(Z);
+      if (ZIsConstant != YIsConstant) {
+        // If both additions in the original were NUW, the new ones are as well.
+        SDNodeFlags Flags =
+            (N->getFlags() & N1->getFlags()) & SDNodeFlags::NoUnsignedWrap;
+        if (YIsConstant)
+          std::swap(Y, Z);
+
+        SDValue Inner = DAG.getMemBasePlusOffset(X, Y, DL, Flags);
+        DCI.AddToWorklist(Inner.getNode());
+        return DAG.getMemBasePlusOffset(Inner, Z, DL, Flags);
+      }
     }
   }