[GR-21590] Update imports

fangerer · fangerer · commit 6e917d5d7ac8 · 2020-06-04T13:22:03.000Z
PullRequest: graalpython/988
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ "overlay": "342d54c7c779683771fd346ae919235334523e58" }
+{ "overlay": "6e0694bba348c69f01d4fb3f7d7ad2e128a93e94" }
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/harness.py b/graalpython/com.oracle.graal.python.benchmarks/python/harness.py
@@ -292,6 +292,17 @@ def run(self):
                 else:
                     print("### iteration=%s, name=%s, duration=%s" % (iteration, self.bench_module.__name__,
                                                                       duration_str))
+                # a bit of fuzzy logic to avoid timing out on configurations
+                # that are slow, without having to rework our logic for getting
+                # default iterations
+                if os.environ.get("CI") and iteration >= 4 and duration > 20:
+                    import statistics
+                    v = durations[-4:]
+                    if statistics.stdev(v) / min(v) < 0.03:
+                        # with less than 3 percent variance across ~20s
+                        # iterations, we can safely stop here
+                        break
+
 
         print(_HRULE)
         print("### teardown ... ")
diff --git a/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-call-method.py b/graalpython/com.oracle.graal.python.benchmarks/python/micro/c-call-method.py
@@ -47,7 +47,6 @@
 static PyObject* nc_method_varargs(PyObject* self, PyObject* args, PyObject* kwds) {
     char *kwdnames[] = { "a", "b", "c", NULL};
     PyObject* longobj = NULL;
-    PyObject* result = NULL;
     int ival = 0;
     long lval = 0;
     long lval2 = 0;
@@ -56,7 +55,6 @@
         return NULL;
     }
     lval2 = PyLong_AsLong(longobj);
-    Py_DECREF(longobj);
     return PyLong_FromLong(lval2 + ival + lval);
 }
 
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codeccallbacks.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codeccallbacks.txt
@@ -1,4 +1,5 @@
 *CodecCallbackTest.test_badregistercall
 *CodecCallbackTest.test_bug828737
+*CodecCallbackTest.test_translatehelper
 *CodecCallbackTest.test_unencodablereplacement
 *CodecCallbackTest.test_unknownhandler
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_float.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_float.txt
@@ -4,6 +4,7 @@
 *FormatTestCase.test_format_testfile
 *FormatTestCase.test_issue35560
 *FormatTestCase.test_issue5864
+*GeneralFloatCases.test_float_containment
 *GeneralFloatCases.test_floatasratio
 *GeneralFloatCases.test_keyword_args
 *HexFloatTestCase.test_ends
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_long.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_long.txt
@@ -1,3 +1,14 @@
 *LongTest.test_access_to_nonexistent_digit_0
 *LongTest.test_bit_length
 *LongTest.test_conversion
+*LongTest.test_floordiv
+*LongTest.test_from_bytes
+*LongTest.test_huge_lshift_of_zero
+*LongTest.test_karatsuba
+*LongTest.test_logs
+*LongTest.test_lshift_of_zero
+*LongTest.test_mod_division
+*LongTest.test_negative_shift_count
+*LongTest.test_shift_bool
+*LongTest.test_small_ints
+*LongTest.test_to_bytes
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_pow.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_pow.txt
@@ -1,2 +1,3 @@
 *PowTest.test_bug643260
 *PowTest.test_bug705231
+*PowTest.test_other
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_select.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_select.txt
@@ -1,2 +1,3 @@
+*SelectTestCase.test_error_conditions
 *SelectTestCase.test_returned_list_identity
 *SelectTestCase.test_select
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_set.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_set.txt
@@ -10,6 +10,10 @@
 *TestBinaryOps.test_intersection_overlap
 *TestBinaryOps.test_intersection_subset
 *TestBinaryOps.test_intersection_superset
+*TestBinaryOps.test_isdisjoint_non_overlap
+*TestBinaryOps.test_isdisjoint_overlap
+*TestBinaryOps.test_isdisjoint_subset
+*TestBinaryOps.test_isdisjoint_superset
 *TestBinaryOps.test_sym_difference_non_overlap
 *TestBinaryOps.test_sym_difference_overlap
 *TestBinaryOps.test_sym_difference_subset
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_shlex.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_shlex.txt
@@ -1 +1,2 @@
 *ShlexTest.testCompat
+*ShlexTest.testJoin
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt
@@ -3,3 +3,14 @@
 *SysModuleTest.test_43581
 *SysModuleTest.test__enablelegacywindowsfsencoding
 *SysModuleTest.test_clear_type_cache
+*SysModuleTest.test_debugmallocstats
+*SysModuleTest.test_dlopenflags
+*SysModuleTest.test_getallocatedblocks
+*SysModuleTest.test_getandroidapilevel
+*SysModuleTest.test_getdefaultencoding
+*SysModuleTest.test_getframe
+*SysModuleTest.test_getwindowsversion
+*SysModuleTest.test_no_duplicates_in_meta_path
+*SysModuleTest.test_refcount
+*SysModuleTest.test_setrecursionlimit_recursion_depth
+*SysModuleTest.test_sys_getwindowsversion_no_instantiation
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unittest.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unittest.txt
@@ -7,3 +7,101 @@
 *testAssertRaisesRegex
 *testAssertRegex
 *testAssertSetEqual
+*test___init__
+*test_class_not_setup_or_torndown_when_skipped
+*test_class_not_torndown_when_setup_fails
+*test_countTestCases
+*test_decorated_skip
+*test_expected_failure
+*test_expected_failure_subtests
+*test_expected_failure_with_wrapped_class
+*test_expected_failure_with_wrapped_subclass
+*test_getTestCaseNames
+*test_getTestCaseNames__inheritance
+*test_getTestCaseNames__no_tests
+*test_getTestCaseNames__not_a_TestCase
+*test_getTestCaseNames__testNamePatterns
+*test_getTestCaseNames__testNamePatterns__attribute_access_regression
+*test_id
+*test_loadTestsFromModule__TestCase_subclass
+*test_loadTestsFromModule__faulty_load_tests
+*test_loadTestsFromModule__load_tests
+*test_loadTestsFromModule__no_TestCase_instances
+*test_loadTestsFromModule__no_TestCase_tests
+*test_loadTestsFromModule__not_a_module
+*test_loadTestsFromModule__pattern
+*test_loadTestsFromModule__too_many_positional_args
+*test_loadTestsFromModule__use_load_tests_deprecated_keyword
+*test_loadTestsFromModule__use_load_tests_deprecated_positional
+*test_loadTestsFromModule__use_load_tests_other_bad_keyword
+*test_loadTestsFromName__callable__TestCase_instance
+*test_loadTestsFromName__callable__TestCase_instance_ProperSuiteClass
+*test_loadTestsFromName__callable__TestSuite
+*test_loadTestsFromName__callable__wrong_type
+*test_loadTestsFromName__empty_name
+*test_loadTestsFromName__function_with_different_name_than_method
+*test_loadTestsFromName__malformed_name
+*test_loadTestsFromName__module_not_loaded
+*test_loadTestsFromName__relative_TestCase_subclass
+*test_loadTestsFromName__relative_TestSuite
+*test_loadTestsFromName__relative_bad_object
+*test_loadTestsFromName__relative_empty_name
+*test_loadTestsFromName__relative_not_a_module
+*test_loadTestsFromName__relative_testmethod
+*test_loadTestsFromName__relative_testmethod_ProperSuiteClass
+*test_loadTestsFromName__unknown_attr_name_on_package
+*test_loadTestsFromName__unknown_module_name
+*test_loadTestsFromNames__callable__TestCase_instance
+*test_loadTestsFromNames__callable__TestSuite
+*test_loadTestsFromNames__callable__call_staticmethod
+*test_loadTestsFromNames__callable__wrong_type
+*test_loadTestsFromNames__empty_name
+*test_loadTestsFromNames__empty_name_list
+*test_loadTestsFromNames__malformed_name
+*test_loadTestsFromNames__module_not_loaded
+*test_loadTestsFromNames__relative_TestCase_subclass
+*test_loadTestsFromNames__relative_TestSuite
+*test_loadTestsFromNames__relative_bad_object
+*test_loadTestsFromNames__relative_empty_name
+*test_loadTestsFromNames__relative_empty_name_list
+*test_loadTestsFromNames__relative_not_a_module
+*test_loadTestsFromNames__relative_testmethod
+*test_loadTestsFromNames__unknown_module_name
+*test_loadTestsFromTestCase
+*test_loadTestsFromTestCase__TestSuite_subclass
+*test_loadTestsFromTestCase__default_method_name
+*test_loadTestsFromTestCase__no_matches
+*test_partial_functions
+*test_run_call_order__error_in_setUp
+*test_run_call_order__error_in_tearDown
+*test_run_call_order__error_in_test
+*test_run_call_order__failure_in_test
+*test_setup_teardown_order_with_pathological_suite
+*test_shortDescription__no_docstring
+*test_shortDescription__singleline_docstring
+*test_skip_class
+*test_skip_doesnt_run_setup
+*test_skip_non_unittest_class
+*test_skip_without_reason
+*test_skipping
+*test_skipping_decorators
+*test_skipping_subtests
+*test_sortTestMethodsUsing__None
+*test_sortTestMethodsUsing__default_value
+*test_sortTestMethodsUsing__getTestCaseNames
+*test_sortTestMethodsUsing__loadTestsFromModule
+*test_sortTestMethodsUsing__loadTestsFromName
+*test_sortTestMethodsUsing__loadTestsFromNames
+*test_sortTestMethodsUsing__loadTestsFromTestCase
+*test_suiteClass__default_value
+*test_suiteClass__loadTestsFromModule
+*test_suiteClass__loadTestsFromName
+*test_suiteClass__loadTestsFromNames
+*test_suiteClass__loadTestsFromTestCase
+*test_testMethodPrefix__default_value
+*test_testMethodPrefix__loadTestsFromModule
+*test_testMethodPrefix__loadTestsFromName
+*test_testMethodPrefix__loadTestsFromNames
+*test_testMethodPrefix__loadTestsFromTestCase
+*test_unexpected_success
+*test_unexpected_success_subtests
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_with.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_with.txt
@@ -14,6 +14,9 @@
 *ExceptionalTestCase.testSingleResource
 *ExitSwallowsExceptionTestCase.testExitFalseDoesntSwallowException
 *ExitSwallowsExceptionTestCase.testExitTrueSwallowsException
+*FailureTestCase.testAssignmentToNoneError
+*FailureTestCase.testAssignmentToTupleContainingNoneError
+*FailureTestCase.testAssignmentToTupleOnlyContainingNoneError
 *FailureTestCase.testEnterAttributeError1
 *FailureTestCase.testEnterAttributeError2
 *FailureTestCase.testEnterThrows
@@ -45,5 +48,5 @@
 *NonexceptionalTestCase.testNestedSingleStatements
 *NonexceptionalTestCase.testUnboundGenerator
 testAssignmentToNoneError
-testAssignmentToTupleOnlyContainingNoneError
 testAssignmentToTupleContainingNoneError
+testAssignmentToTupleOnlyContainingNoneError
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_xdrlib.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_xdrlib.txt
@@ -3,3 +3,4 @@
 *ConversionErrorTest.test_pack_int
 *ConversionErrorTest.test_pack_uint
 *ConversionErrorTest.test_uhyper
+*XDRTest.test_xdr
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java
@@ -494,7 +494,7 @@ protected static PythonClassNativeWrapper wrapNativeClass(PythonManagedClass obj
 
         static boolean isFallback(Object object, PythonObjectLibrary lib) {
             return !(object instanceof String || object instanceof Boolean || object instanceof Integer || object instanceof Long || object instanceof Double ||
-                            object instanceof PythonNativeNull || object instanceof PythonAbstractObject) &&
+                            object instanceof PythonNativeNull || object == DescriptorDeleteMarker.INSTANCE || object instanceof PythonAbstractObject) &&
                             !(lib.isForeignObject(object) && !CApiGuards.isNativeWrapper(object));
         }
 
@@ -656,6 +656,12 @@ static Object doNativeNull(CExtContext cextContext, PythonNativeNull object) {
             return ToSulongNode.doNativeNull(cextContext, object);
         }
 
+        @Specialization
+        static Object doDeleteMarker(CExtContext cextContext, DescriptorDeleteMarker marker,
+                        @Cached GetNativeNullNode getNativeNullNode) {
+            return ToSulongNode.doDeleteMarker(cextContext, marker, getNativeNullNode);
+        }
+
         @Specialization(guards = {"object == cachedObject", "isSpecialSingleton(cachedObject)"})
         static Object doSingletonCached(CExtContext cextContext, @SuppressWarnings("unused") PythonAbstractObject object,
                         @Cached("object") PythonAbstractObject cachedObject,
@@ -827,6 +833,12 @@ static Object doNativeNull(CExtContext cextContext, PythonNativeNull object) {
             return ToSulongNode.doNativeNull(cextContext, object);
         }
 
+        @Specialization
+        static Object doDeleteMarker(CExtContext cextContext, DescriptorDeleteMarker marker,
+                        @Cached GetNativeNullNode getNativeNullNode) {
+            return ToSulongNode.doDeleteMarker(cextContext, marker, getNativeNullNode);
+        }
+
         @Specialization(guards = {"object == cachedObject", "isSpecialSingleton(cachedObject)"})
         static Object doSingletonCached(CExtContext cextContext, @SuppressWarnings("unused") PythonAbstractObject object,
                         @Cached("object") PythonAbstractObject cachedObject,
@@ -1003,6 +1015,9 @@ protected static boolean isFallback(Object obj, GetLazyClassNode getClassNode, I
             if (CApiGuards.isNativeNull(obj)) {
                 return false;
             }
+            if (obj == DescriptorDeleteMarker.INSTANCE) {
+                return false;
+            }
             if (PGuards.isAnyPythonObject(obj)) {
                 return false;
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/DescriptorDeleteMarker.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/DescriptorDeleteMarker.java
@@ -40,7 +40,9 @@
  */
 package com.oracle.graal.python.builtins.objects.getsetdescriptor;
 
-public class DescriptorDeleteMarker {
+import com.oracle.truffle.api.interop.TruffleObject;
+
+public class DescriptorDeleteMarker implements TruffleObject {
     public static final DescriptorDeleteMarker INSTANCE = new DescriptorDeleteMarker();
 
     private DescriptorDeleteMarker() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java
@@ -1185,11 +1185,20 @@ Object doLLOvf(long left, long right) {
             }
         }
 
-        @Specialization
+        @Specialization(guards = {"left == 0", "right.isZeroOrPositive()"})
+        static int doLPiZero(@SuppressWarnings("unused") long left, @SuppressWarnings("unused") PInt right) {
+            return 0;
+        }
+
+        @Specialization(replaces = "doLPiZero")
         PInt doLPi(long left, PInt right) {
             raiseNegativeShiftCount(!right.isZeroOrPositive());
+            if (left == 0) {
+                return factory().createInt(BigInteger.ZERO);
+            }
             try {
-                return factory().createInt(op(PInt.longToBigInteger(left), right.intValueExact()));
+                int iright = right.intValueExact();
+                return factory().createInt(op(PInt.longToBigInteger(left), iright));
             } catch (ArithmeticException e) {
                 throw raise(PythonErrorType.OverflowError);
             }
@@ -1219,9 +1228,17 @@ PInt doPiL(PInt left, long right) {
             }
         }
 
-        @Specialization
+        @Specialization(guards = {"left.isZero()", "right.isZeroOrPositive()"})
+        static int doPiPiZero(@SuppressWarnings("unused") PInt left, @SuppressWarnings("unused") PInt right) {
+            return 0;
+        }
+
+        @Specialization(replaces = "doPiPiZero")
         PInt doPiPi(PInt left, PInt right) {
             raiseNegativeShiftCount(!right.isZeroOrPositive());
+            if (left.isZero()) {
+                return factory().createInt(BigInteger.ZERO);
+            }
             try {
                 return factory().createInt(op(left.getValue(), right.intValueExact()));
             } catch (ArithmeticException e) {
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "16810c92d8bef5dcd2c81c80d3cb1c624e717cf7",
+                "version": "56dbf766ace4a1cd5df495a882f44b09909455d4",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "16810c92d8bef5dcd2c81c80d3cb1c624e717cf7",
+                "version": "56dbf766ace4a1cd5df495a882f44b09909455d4",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "16810c92d8bef5dcd2c81c80d3cb1c624e717cf7",
+                "version": "56dbf766ace4a1cd5df495a882f44b09909455d4",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "overlay": "342d54c7c779683771fd346ae919235334523e58" }`
	`1`	`+{ "overlay": "6e0694bba348c69f01d4fb3f7d7ad2e128a93e94" }`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@`
`47`	`47`	`static PyObject* nc_method_varargs(PyObject* self, PyObject* args, PyObject* kwds) {`
`48`	`48`	`char *kwdnames[] = { "a", "b", "c", NULL};`
`49`	`49`	`PyObject* longobj = NULL;`
`50`		`- PyObject* result = NULL;`
`51`	`50`	`int ival = 0;`
`52`	`51`	`long lval = 0;`
`53`	`52`	`long lval2 = 0;`
`@@ -56,7 +55,6 @@`
`56`	`55`	`return NULL;`
`57`	`56`	`}`
`58`	`57`	`lval2 = PyLong_AsLong(longobj);`
`59`		`- Py_DECREF(longobj);`
`60`	`58`	`return PyLong_FromLong(lval2 + ival + lval);`
`61`	`59`	`}`
`62`	`60`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`*PowTest.test_bug643260`
`2`	`2`	`*PowTest.test_bug705231`
	`3`	`+*PowTest.test_other`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+*SelectTestCase.test_error_conditions`
`1`	`2`	`*SelectTestCase.test_returned_list_identity`
`2`	`3`	`*SelectTestCase.test_select`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`*ShlexTest.testCompat`
	`2`	`+*ShlexTest.testJoin`