[GR-45047] Handle 0 values in tck division verifier

PullRequest: graalpython/2751

Author: timfel

graalpython/com.oracle.graal.python.pegparser.generator/pegjava/java_generator.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2021, 2023, Oracle and/or its affiliates.
 # Copyright (C) 1996-2021 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -374,7 +374,7 @@ def __str__(self) -> str:
 }
 
 LICENSE = '''/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -904,6 +904,7 @@ def generate(self, filename: str) -> None:
         self.print(IMPORTS)
         className = os.path.splitext(os.path.basename(self.file.name))[0]
         self.print('@SuppressWarnings({"all", "cast"})')
+        self.print('@SuppressFBWarnings')
         self.print("public final class %s extends AbstractParser {" % className)
         # Java needs a few fields declarations. Also, we're now in a class
         self.level += 1

graalpython/com.oracle.graal.python.pegparser/src/com/oracle/graal/python/pegparser/Parser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -54,6 +54,7 @@
 import java.util.List;
 
 @SuppressWarnings({"all", "cast"})
+@SuppressFBWarnings
 public final class Parser extends AbstractParser {
 
     private static final Object[][][] reservedKeywords = new Object[][][]{

graalpython/com.oracle.graal.python.pegparser/src/com/oracle/graal/python/pegparser/SuppressFBWarnings.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.pegparser;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.CLASS)
+public @interface SuppressFBWarnings {
+    /**
+     * The set of FindBugs
+     * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
+     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     */
+    java.lang.String[] value() default {};
+}

graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java

@@ -172,6 +172,7 @@ public Collection<? extends Snippet> createValueConstructors(Context context) {
             "bool:True", BOOL, "True",
             "bool:False", BOOL, "False",
             "int", INT, "1",
+            // "int:0", INT, "0", // disabled due to GR-45046
             "float", FLOAT, "1.1",
             "complex", COMPLEX, "1.0j",
             "str", STR, "class pstr(str):\n pass\npstr('hello world')",
@@ -522,8 +523,12 @@ public void accept(SnippetRun snippetRun) throws PolyglotException {
             Value par0 = parameters.get(0);
             Value par1 = parameters.get(1);
 
-            // If anumber/Boolean should be divided, ignore if divisor is Boolean false
-            if (!par0.isNumber() && !par0.isBoolean() || !par1.isBoolean() || par1.asBoolean()) {
+            // If a number should be divided by 0 or false, expect an exception
+            if ((par0.isNumber() || par0.isBoolean()) && (par1.isBoolean() && par1.asBoolean() == false || par1.isNumber() && par1.fitsInInt() && par1.asInt() == 0)) {
+                if (snippetRun.getException() == null || !snippetRun.getException().getMessage().contains("division by zero")) {
+                    throw new AssertionError("Division by 0 should have raised");
+                }
+            } else {
                 ResultVerifier.getDefaultResultVerifier().accept(snippetRun);
             }
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ExternalFunctionNodes.java

@@ -447,7 +447,7 @@ static RootCallTarget getOrCreateCallTarget(PExternalFunctionWrapper sig, Python
                         return null;
                     }
                     nodeKlass = MethKeywordsRoot.class;
-                    rootNodeFunction = doArgAndResultConversion ? l -> new MethKeywordsRoot(l, name, isStatic, sig) : l -> new MethKeywordsRoot(l, name, isStatic);
+                    rootNodeFunction = l -> new MethKeywordsRoot(l, name, isStatic, sig);
                     break;
                 case VARARGS:
                     nodeKlass = MethVarargsRoot.class;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/Compiler.java

@@ -159,6 +159,7 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.compiler.OpCodes.CollectionBits;
 import com.oracle.graal.python.lib.PyObjectRichCompareBool;
+import com.oracle.graal.python.util.SuppressFBWarnings;
 import com.oracle.graal.python.pegparser.AbstractParser;
 import com.oracle.graal.python.pegparser.ErrorCallback;
 import com.oracle.graal.python.pegparser.ErrorCallback.ErrorType;
@@ -3679,6 +3680,7 @@ private BlockInfo.Loop unwindBlockStack(UnwindType type) {
     }
 
     @Override
+    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH") // info is not null guaranteed by parser
     public Void visit(StmtTy.Break node) {
         setLocation(node);
         setLocation(node);
@@ -3691,6 +3693,7 @@ public Void visit(StmtTy.Break node) {
     }
 
     @Override
+    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH") // info is not null guaranteed by parser
     public Void visit(StmtTy.Continue node) {
         setLocation(node);
         BlockInfo.Loop info = unwindBlockStack(UnwindType.CONTINUE);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/MatchClassNode.java

@@ -186,8 +186,4 @@ private static boolean contains(VirtualFrame frame, Object[] seen, Object name,
     public static MatchClassNode create() {
         return MatchClassNodeGen.create();
     }
-
-    public static MatchClassNode getUncached() {
-        return MatchClassNodeGen.getUncached();
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/AsyncHandler.java

@@ -69,6 +69,7 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.graal.python.util.Supplier;
+import com.oracle.graal.python.util.SuppressFBWarnings;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
@@ -312,6 +313,7 @@ public boolean isInternal() {
      * regular intervals to run on a separate thread, or if it will be polled. The caller needs to
      * ensure that the AsyncAction passed into this method does not block in the latter case.
      */
+    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH") // context.get() is never null here
     void registerAction(Supplier<AsyncAction> actionSupplier) {
         CompilerAsserts.neverPartOfCompilation();
         if (ImageInfo.inImageBuildtimeCode() || context.get().getOption(PythonOptions.NoAsyncActions)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/SuppressFBWarnings.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -50,5 +50,5 @@
      * <a href="http://findbugs.sourceforge.net/bugDescriptions.html">warnings</a> that are to be
      * suppressed in annotated element. The value can be a bug category, kind or pattern.
      */
-    java.lang.String[] value();
+    java.lang.String[] value() default {};
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/WeakIdentityHashMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -373,6 +373,7 @@ private static int indexFor(int h, int length) {
     /**
      * Expunges stale entries from the table.
      */
+    @SuppressFBWarnings(value = "SA_FIELD_SELF_ASSIGNMENT")
     private void expungeStaleEntries() {
         for (Object x; (x = queue.poll()) != null; ) {
             synchronized (queue) {
@@ -838,6 +839,7 @@ private abstract class HashIterator<T> implements Iterator<T> {
             index = isEmpty() ? 0 : table.length;
         }
 
+        @SuppressFBWarnings(value = "SA_FIELD_SELF_ASSIGNMENT")
         public boolean hasNext() {
             Entry<K,V>[] t = table;