Merge branch 'master' into bugfix/GR-14380

Author: ppisl

3rd_party_licenses.txt

@@ -4,7 +4,7 @@ Component
 This is a release of GraalVM Community Edition 1.0 Python Language Component. 
 This particular copy of the software is released under Universal Permissive 
 License (UPL) v. 1.0.
-Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved
+Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved
 
 ===========================================================================
            Universal Permissive License v. 1.0.

LICENSE

@@ -244,6 +244,17 @@
       name: "deploy-binaries-"+platform,
     },
 
+  local coverageGate = commonBuilder + {
+      targets: TARGET.weekly,
+      run +: [
+// cannot run with excluded "GeneratedBy" since that would lead to "command line too long"
+//        ['mx', '--jacoco-whitelist-package', 'com.oracle.graal.python', '--jacoco-exclude-annotation', '@GeneratedBy', '--strict-compliance', "--dynamicimports", super.dynamicImports, "--primary", 'gate', '-B=--force-deprecation-as-warning-for-dependencies', '--strict-mode', '--tags', "python-junit", '--jacocout', 'html'],
+//        ['mx', '--jacoco-whitelist-package', 'com.oracle.graal.python', '--jacoco-exclude-annotation', '@GeneratedBy', 'sonarqube-upload', "-Dsonar.host.url=$SONAR_HOST_URL", "-Dsonar.projectKey=com.oracle.graalvm.python", "-Dsonar.projectName=GraalVM - Python", '--exclude-generated'],
+        ['mx', '--jacoco-whitelist-package', 'com.oracle.graal.python', '--strict-compliance', "--dynamicimports", super.dynamicImports, "--primary", 'gate', '-B=--force-deprecation-as-warning-for-dependencies', '--strict-mode', '--tags', "python-junit", '--jacocout', 'html'],
+        ['mx', '--jacoco-whitelist-package', 'com.oracle.graal.python', 'sonarqube-upload', "-Dsonar.host.url=$SONAR_HOST_URL", "-Dsonar.projectKey=com.oracle.graalvm.python", "-Dsonar.projectName=GraalVM - Python", '--exclude-generated'],
+      ],
+      name: "python-coverage"
+    } + getPlatform(platform="linux"),
   // ------------------------------------------------------------------------------------------------------
   //
   // the gates
@@ -263,6 +274,9 @@
     // style
     styleGate,
 
+    // coverage
+    coverageGate,
+
     // graalvm gates
     graalVmGate,
 

ci.jsonnet

@@ -67,6 +67,11 @@ def test_boolean2int():
     assert int(False) == 0
 
 
+def test_bigint_mul():
+    assert 99999937497465632974931 * 1223432423545234234123123 == 122343165886896325043539375228725106116626429513
+    assert 99999937497465632974931 * (2**100) == 126764980791447734004805377032945185921379990352429056
+
+
 def test_int_from_custom():
     class CustomInt4():
         def __int__(self):

graalpython/com.oracle.graal.python.test/src/tests/test_int.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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
@@ -70,3 +70,22 @@ def test_call_builtin_method():
 def test_call_builtin_unbound_method():
     x = {1: 2}
     assert dict.__getitem__.__call__(x, 1) == 2
+
+
+def test_make_method():
+    method_type = type(X().foo)
+
+    class A():
+        def __init__(self, *args):
+            pass
+
+        def __call__(self, x, y):
+            assert isinstance(x, str)
+            assert isinstance(self, A)
+            return "A" + str(x) + str(y)
+
+    method1 = method_type(A, A)
+    method2 = method_type(A(), " is ")
+
+    assert isinstance(method1(), A)
+    assert method2(1) == "A is 1", method2(1)

graalpython/com.oracle.graal.python.test/src/tests/test_methods.py

@@ -13,6 +13,7 @@ def __init__(self, value):
     def __index__(self):
         return self.value
 
+
 def test_find():
     assert "teststring".find("test") == 0
     assert "teststring".find("string") == 4
@@ -80,6 +81,7 @@ def test_rfind():
     assert s.rfind('ahoj', 16, 20) == 16
     assert s.rfind('ahoj', 16, 19) == -1
 
+
 def test_format():
     assert "{}.{}".format("part1", "part2") == "part1.part2"
     assert "{0}.{1}".format("part1", "part2") == "part1.part2"
@@ -1023,34 +1025,74 @@ def test_translate():
     else:
         assert False, "should raise"
 
+
 def test_translate_from_byte_table():
     table = bytes.maketrans(bytes(string.ascii_lowercase, 'ascii'), bytes(string.ascii_uppercase, 'ascii'))
     assert "ahoj".translate(table) == "AHOJ"
     assert "ahoj".translate(bytearray(table)) == "AHOJ"
     assert "ahoj".translate(memoryview(table)) == "AHOJ"
 
+
 def test_tranlslate_from_short_table():
     table = b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ABCDEFGH'
     assert "ahoj".translate(table) == "AHoj"
 
+
 def test_translate_nonascii_from_byte_table():
     table = bytes.maketrans(bytes(string.ascii_lowercase, 'ascii'), bytes(string.ascii_uppercase, 'ascii'))
     assert "ačhřožj".translate(table) == "AčHřOžJ"
 
+
 def test_translate_from_long_byte_table():
     table = bytes.maketrans(bytes(string.ascii_lowercase, 'ascii'), bytes(string.ascii_uppercase, 'ascii'))
     table *= 30
     assert 'ahoj453875287ščřžýáí'.translate(table) == 'AHOJ453875287A\rY~ýáí'
 
+
 def test_splitlines():
     assert len(str.splitlines("\n\n")) == 2
     assert len(str.splitlines("\n")) == 1
     assert len(str.splitlines("a\nb")) == 2
 
+
 def test_literals():
     s = "hello\[world\]"
     assert len(s) == 14
     assert "hello\[world\]"[5] == "\\"
     assert "hello\[world\]"[6] == "["
     assert "hello\[world\]"[12] == "\\"
     assert "hello\[world\]"[13] == "]"
+
+
+def test_strip_whitespace():
+    assert 'hello' == '   hello   '.strip()
+    assert 'hello   ' == '   hello   '.lstrip()
+    assert '   hello' == '   hello   '.rstrip()
+    assert 'hello' == 'hello'.strip()
+
+    b = ' \t\n\r\f\vabc \t\n\r\f\v'
+    assert 'abc' == b.strip()
+    assert 'abc \t\n\r\f\v' == b.lstrip()
+    assert ' \t\n\r\f\vabc' == b.rstrip()
+
+    # strip/lstrip/rstrip with None arg
+    assert 'hello' == '   hello   '.strip(None)
+    assert 'hello   ' == '   hello   '.lstrip(None)
+    assert '   hello' == '   hello   '.rstrip(None)
+    assert 'hello' == 'hello'.strip(None)
+
+
+def test_strip_with_sep():
+    # strip/lstrip/rstrip with str arg
+    assert 'hello' == 'xyzzyhelloxyzzy'.strip('xyz')
+    assert 'helloxyzzy' == 'xyzzyhelloxyzzy'.lstrip('xyz')
+    assert 'xyzzyhello' == 'xyzzyhelloxyzzy'.rstrip('xyz')
+    assert 'hello' == 'hello'.strip('xyz')
+    assert '' == 'mississippi'.strip('mississippi')
+
+    # only trim the start and end; does not strip internal characters
+    assert 'mississipp' == 'mississippi'.strip('i')
+
+    assertRaises(TypeError, 'hello', 'strip', 42, 42)
+    assertRaises(TypeError, 'hello', 'lstrip', 42, 42)
+    assertRaises(TypeError, 'hello', 'rstrip', 42, 42)

graalpython/com.oracle.graal.python.test/src/tests/test_string.py

@@ -140,6 +140,7 @@
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.control.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
+import com.oracle.graal.python.nodes.datamodel.IsCallableNode;
 import com.oracle.graal.python.nodes.datamodel.IsIndexNode;
 import com.oracle.graal.python.nodes.datamodel.IsSequenceNode;
 import com.oracle.graal.python.nodes.expression.CastToListNode;
@@ -2378,13 +2379,23 @@ public Object generator(Object args, Object kwargs) {
     @GenerateNodeFactory
     public abstract static class MethodTypeNode extends PythonTernaryBuiltinNode {
         @Specialization
-        Object method(LazyPythonClass cls, Object self, PFunction func) {
+        Object method(LazyPythonClass cls, PFunction func, Object self) {
             return factory().createMethod(cls, self, func);
         }
 
-        @Specialization(guards = "isPythonBuiltinClass(cls)")
-        Object methodGeneric(@SuppressWarnings("unused") LazyPythonClass cls, Object self, PBuiltinFunction func) {
-            return factory().createBuiltinMethod(self, func);
+        @Specialization
+        Object methodBuiltin(@SuppressWarnings("unused") LazyPythonClass cls, PBuiltinFunction func, Object self) {
+            return factory().createMethod(self, func);
+        }
+
+        @Specialization
+        Object methodGeneric(@SuppressWarnings("unused") LazyPythonClass cls, Object func, Object self,
+                        @Cached("create()") IsCallableNode isCallable) {
+            if (isCallable.execute(func)) {
+                return factory().createMethod(self, func);
+            } else {
+                throw raise(TypeError, "first argument must be callable");
+            }
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -60,7 +60,6 @@
 import com.oracle.truffle.api.interop.Resolve;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.PrimitiveValueProfile;
 
 @MessageResolution(receiverType = MethodWrapper.class)
 public class ManagedMethodWrappersMR {
@@ -76,8 +75,6 @@ abstract static class ExecuteNode extends Node {
         @Child private ExecuteKeywordStarargsNode expandKwargsNode = ExecuteKeywordStarargsNode.create();
         @Child private CallNode dispatch;
 
-        private final PrimitiveValueProfile starArgsLenProfile = PrimitiveValueProfile.createEqualityProfile();
-
         public Object access(MethKeywords object, Object[] arguments) {
             if (arguments.length != 3) {
                 throw ArityException.raise(3, arguments.length);
@@ -90,8 +87,7 @@ public Object access(MethKeywords object, Object[] arguments) {
             Object kwArgs = toJavaNode.execute(arguments[2]);
 
             Object[] starArgsArray = posStarargsNode.executeWith(starArgs);
-            int starArgsLen = starArgsLenProfile.profile(starArgsArray.length);
-            Object[] pArgs = PositionalArgumentsNode.prependArgument(receiver, starArgsArray, starArgsLen);
+            Object[] pArgs = PositionalArgumentsNode.prependArgument(receiver, starArgsArray);
             PKeyword[] kwArgsArray = expandKwargsNode.executeWith(kwArgs);
 
             // execute

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

@@ -162,7 +162,6 @@ public abstract static class GetCodeNode extends PythonBuiltinNode {
         protected Object get(PCode self) {
             byte[] codestring = self.getCodestring();
             if (codestring == null) {
-                // TODO: this is for the moment undefined
                 codestring = new byte[0];
             }
             return factory().createBytes(codestring);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeBuiltins.java

@@ -53,6 +53,7 @@
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
+import com.oracle.graal.python.nodes.code.GetFunctionCodeNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
@@ -245,8 +246,9 @@ Object doGeneric(Object object) {
     @GenerateNodeFactory
     public abstract static class GetCodeNode extends PythonBinaryBuiltinNode {
         @Specialization(guards = {"isNoValue(none)"})
-        Object getCode(PFunction self, @SuppressWarnings("unused") PNone none) {
-            return self.getCode();
+        Object getCodeU(PFunction self, @SuppressWarnings("unused") PNone none,
+                        @Cached("create()") GetFunctionCodeNode getFunctionCodeNode) {
+            return getFunctionCodeNode.execute(self);
         }
 
         @SuppressWarnings("unused")