src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java

@@ -89,12 +89,14 @@
     }
 
     public static <OP> ConstantNode tryConstantFold(BinaryOp<OP> op, ValueNode forX, ValueNode forY, Stamp stamp) {
         if (forX.isConstant() && forY.isConstant()) {
             Constant ret = op.foldConstant(forX.asConstant(), forY.asConstant());
+            if (ret != null) {
             return ConstantNode.forPrimitive(stamp, ret);
         }
+        }
         return null;
     }
 
     @Override
     public Stamp foldStamp(Stamp stampX, Stamp stampY) {