[InstCombine] Address review comments.

Author: dtcxzyw

llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp

@@ -3994,18 +3994,17 @@ Instruction *InstCombinerImpl::visitCallBase(CallBase &Call) {
 
   for (Value *V : Call.args()) {
     if (V->getType()->isPointerTy()) {
-      // Simplify the nonnull operand before nonnull inference to avoid
-      // unnecessary queries.
+      // Simplify the nonnull operand if the parameter is known to be nonnull.
+      // Otherwise, try to infer nonnull for it.
       if (Call.paramHasNonNullAttr(ArgNo, /*AllowUndefOrPoison=*/true)) {
         if (Value *Res = simplifyNonNullOperand(V)) {
           replaceOperand(Call, ArgNo, Res);
           Changed = true;
         }
-      }
-
-      if (!Call.paramHasAttr(ArgNo, Attribute::NonNull) &&
-          isKnownNonZero(V, getSimplifyQuery().getWithInstruction(&Call)))
+      } else if (isKnownNonZero(V,
+                                getSimplifyQuery().getWithInstruction(&Call))) {
         ArgNos.push_back(ArgNo);
+      }
     }
     ArgNo++;
   }