Merge branch 'master' into feature/GR-20901

# Conflicts:
#	graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/elif01.tast
#	graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/collections__init__.tast
#	graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/enumt.tast
#	graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/functions.tast
#	graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/initCollectionsPart2.tast
#	graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/locale.tast
#	graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/site.tast
#	graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/sre_compile.tast
#	graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/sre_parse.tast

Author: ppisl

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/datatype/PRangeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -75,7 +75,7 @@ public void loopWithOnlyStop() throws UnexpectedResultException {
         Object iter = getIter.executeWith(null, range);
         GetNextNode next = GetNextNode.create();
         testRoot.doInsert(next);
-        IsBuiltinClassProfile errorProfile = IsBuiltinClassProfile.create();
+        IsBuiltinClassProfile errorProfile = IsBuiltinClassProfile.getUncached();
 
         while (true) {
             try {
@@ -99,7 +99,7 @@ public void loopWithStep() throws UnexpectedResultException {
         Object iter = getIter.executeWith(null, range);
         GetNextNode next = GetNextNode.create();
         testRoot.doInsert(next);
-        IsBuiltinClassProfile errorProfile = IsBuiltinClassProfile.create();
+        IsBuiltinClassProfile errorProfile = IsBuiltinClassProfile.getUncached();
 
         while (true) {
             try {

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/ParserTestBase.java

@@ -75,6 +75,8 @@ public class ParserTestBase {
     protected boolean printFormatStringLiteralValues = false;
     protected int printOnlyDiffIfLenIsBigger = 1000;
 
+    private static final boolean REGENERATE_TREE = false;
+
     @Rule public TestName name = new TestName();
 
     private ScopeInfo lastGlobalScope;
@@ -162,7 +164,7 @@ public void saveNewTreeResult(File testFile, boolean goldenFileNextToTestFile) t
         File newGoldenFile = goldenFileNextToTestFile
                         ? new File(testFile.getParentFile(), getFileName(testFile) + NEW_GOLDEN_FILE_EXT)
                         : getGoldenFile(NEW_GOLDEN_FILE_EXT);
-        if (!newGoldenFile.exists()) {
+        if (REGENERATE_TREE || !newGoldenFile.exists()) {
             try (FileWriter fw = new FileWriter(newGoldenFile)) {
                 fw.write(tree);
             }
@@ -179,7 +181,7 @@ public void checkTreeFromFile(File testFile, boolean goldenFileNextToTestFile) t
         File goldenFile = goldenFileNextToTestFile
                         ? new File(testFile.getParentFile(), getFileName(testFile) + GOLDEN_FILE_EXT)
                         : getGoldenFile(GOLDEN_FILE_EXT);
-        if (!goldenFile.exists()) {
+        if (REGENERATE_TREE || !goldenFile.exists()) {
             try (FileWriter fw = new FileWriter(goldenFile)) {
                 fw.write(tree);
             }
@@ -199,7 +201,7 @@ public void saveNewScope(File testFile, boolean goldenFileNextToTestFile) throws
         File newScopeFile = goldenFileNextToTestFile
                         ? new File(testFile.getParentFile(), getFileName(testFile) + NEW_SCOPE_FILE_EXT)
                         : getGoldenFile(NEW_SCOPE_FILE_EXT);
-        if (!newScopeFile.exists()) {
+        if (REGENERATE_TREE || !newScopeFile.exists()) {
             try (FileWriter fw = new FileWriter(newScopeFile)) {
                 fw.write(scopes.toString());
             }
@@ -217,7 +219,7 @@ public void checkScopeFromFile(File testFile, boolean goldenFileNextToTestFile)
         File goldenScopeFile = goldenFileNextToTestFile
                         ? new File(testFile.getParentFile(), getFileName(testFile) + SCOPE_FILE_EXT)
                         : getGoldenFile(SCOPE_FILE_EXT);
-        if (!goldenScopeFile.exists()) {
+        if (REGENERATE_TREE || !goldenScopeFile.exists()) {
             try (FileWriter fw = new FileWriter(goldenScopeFile)) {
                 fw.write(scopes.toString());
             }
@@ -230,7 +232,7 @@ public void checkTreeResult(String source, PythonParser.ParserMode mode, Frame f
         Node resultNew = parse(source, name.getMethodName(), mode, frame);
         String tree = printTreeToString(resultNew);
         File goldenFile = getGoldenFile(GOLDEN_FILE_EXT);
-        if (!goldenFile.exists()) {
+        if (REGENERATE_TREE || !goldenFile.exists()) {
             try (FileWriter fw = new FileWriter(goldenFile)) {
                 fw.write(tree);
             }
@@ -249,7 +251,7 @@ public void checkScopeResult(String source, PythonParser.ParserMode mode) throws
         StringBuilder scopes = new StringBuilder();
         scopeNew.debugPrint(scopes, 0);
         File goldenScopeFile = getGoldenFile(SCOPE_FILE_EXT);
-        if (!goldenScopeFile.exists()) {
+        if (REGENERATE_TREE || !goldenScopeFile.exists()) {
             try (FileWriter fw = new FileWriter(goldenScopeFile)) {
                 fw.write(scopes.toString());
             }

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

@@ -0,0 +1,128 @@
+# Copyright (c) 2020, 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.
+
+import sys
+
+
+def test_pow():
+    if sys.implementation.name == "graalpython":
+        try:
+            2 ** (2**128)
+        except ArithmeticError:
+            assert True
+        else:
+            assert False
+
+    assert 2 ** -(2**128) == 0.0
+
+    class X(float):
+        def __rpow__(self, other):
+            return 42
+
+    assert 2 ** X() == 42
+
+    try:
+        2.0 .__pow__(2, 2)
+    except TypeError as e:
+        assert True
+    else:
+        assert False
+
+    try:
+        2.0 .__pow__(2.0, 2.0)
+    except TypeError as e:
+        assert True
+    else:
+        assert False
+
+    assert 2 ** 2.0 == 4.0
+
+    assert 2 .__pow__("a") == NotImplemented
+    assert 2 .__pow__("a", 2) == NotImplemented
+    assert 2 .__pow__(2**30, 2**128) == 0
+
+    # crafted to try specializations
+    def mypow(a, b, c):
+        return a.__pow__(b, c)
+
+    values = [
+        [1, 2, None, 1], # long
+        [1, 128, None, 1], # BigInteger
+        [1, -2, None, 1.0], # double result
+        [1, 0xffffffffffffffffffffffffffffffff & 0x80, None, 1], # narrow to long
+        [2, 0xffffffffffffffffffffffffffffffff & 0x80, None, 340282366920938463463374607431768211456], # cannot narrow
+        [2, -(0xffffffffffffffffffffffffffffffff & 0x80), None, 2.938735877055719e-39], # double result
+        [2**128, 0, None, 1], # narrow to long
+        [2**128, 1, None, 340282366920938463463374607431768211456], # cannot narrow
+        [2**128, -2, None, 8.636168555094445e-78], # double
+        [2**128, 0xffffffffffffffffffffffffffffffff & 0x2, None, 115792089237316195423570985008687907853269984665640564039457584007913129639936], # large
+        [2**128, -(0xffffffffffffffffffffffffffffffff & 0x8), None, 5.562684646268003e-309], # double result
+        [1, 2, 3, 1], # fast path
+        [2, 2**30, 2**128, 0], # generic
+        ] + []
+
+    if sys.version_info.minor >= 8:
+        values += [
+            [1, -2, 3, 1], # fast path double
+            [1, 2, -3, -2], # negative mod
+            [1, -2, -3, -2], # negative mod and negative right
+            [1, -2**128, 3, 1], # mod and large negative right
+            [1, -2**128, -3, -2], # negative mod and large negative right
+            [1, -2**128, -2**64, -18446744073709551615], # large negative mod and large negative right
+        ]
+
+    for args in values:
+        assert mypow(*args[:-1]) == args[-1], "%r -> %r == %r" % (args, mypow(*args[:-1]), args[-1])
+
+    def mypow_rev(a, b, c):
+        return a.__pow__(b, c)
+
+    for args in reversed(values):
+        assert mypow_rev(*args[:-1]) == args[-1], "%r -> %r == %r" % (args, mypow(*args[:-1]), args[-1])
+
+    assert 2**1.0 == 2.0
+
+    try:
+        pow(12,-2,100)
+    except ValueError as e:
+        assert "base is not invertible for the given modulus" in str(e)
+    else:
+        assert False
+
+    assert pow(1234567, -2, 100) == 9

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

@@ -21,6 +21,9 @@
 # AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import sys
+
 def test_add_long_overflow():
     # max long value is written as long primitive
     val = 0x7fffffffffffffff
@@ -295,3 +298,8 @@ def test_lshift():
 def test_pow():
     # (0xffffffffffffffff >> 63) is used to produce a non-narrowed int
     assert 2**(0xffffffffffffffff >> 63) == 2
+
+    if sys.version_info.minor >= 8:
+        # for some reason this hangs CPython on the CI even if it's just parsed
+        from pow_tests import test_pow
+        test_pow()

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/annotationType01.tast

@@ -12,7 +12,11 @@ ModuleRootNode Name: <module 'annotationType01'> SourceSection: [0,6]`j: int`
       SetItemNodeGen SourceSection: [0,0]Empty
         ReadNameNodeGen SourceSection: None
           Identifier: __annotations__
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
         StringLiteralNode SourceSection: [0,0]Empty
         ReadNameNodeGen SourceSection: [3,6]`int`
           Identifier: int
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
       EmptyNode SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/annotationType02.tast

@@ -38,8 +38,12 @@ ModuleRootNode Name: <module 'annotationType02'> SourceSection: [0,28]`def fn():
                         Identifier: index
                         WriteLocalFrameSlotNodeGen SourceSection: None
                           Frame: [0,index,Illegal]
+                          IsBuiltinClassProfile SourceSection: None
+                            CachedDispatchFirst SourceSection: None
                         IntegerLiteralNode SourceSection: [26,27]`0`
                           Value: 0
                   Return Expresssion: ReadLocalVariableNode SourceSection: None
                     Frame: [1,<return_val>,Illegal]
+                    IsBuiltinClassProfile SourceSection: None
+                      CachedDispatchFirst SourceSection: None
                     ReadVariableFromFrameNodeGen SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/annotationType03.tast

@@ -17,11 +17,17 @@ ModuleRootNode Name: <module 'annotationType03'> SourceSection: [0,39]`j = 1↵a
                   Key: __annotations__
                   LookupAndCallBinaryNodeGen SourceSection: None
                     Op: __getattribute__
+                  IsBuiltinClassProfile SourceSection: None
+                    CachedDispatchFirst SourceSection: None
                 ReadNameNodeGen SourceSection: [6,10]`ahoj`
                   Identifier: ahoj
+                  IsBuiltinClassProfile SourceSection: None
+                    CachedDispatchFirst SourceSection: None
               StringLiteralNode SourceSection: [27,30]`'j'`
               ReadNameNodeGen SourceSection: [34,39]`float`
                 Identifier: float
+                IsBuiltinClassProfile SourceSection: None
+                  CachedDispatchFirst SourceSection: None
       SideEffect:
         WriteNameNodeGen SourceSection: [0,5]`j = 1`
           Identifier: j

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment02.tast

@@ -10,16 +10,22 @@ ModuleRootNode Name: <module 'assignment02'> SourceSection: [0,9]`a = b = 1`
         Identifier: <>temp0
         WriteLocalFrameSlotNodeGen SourceSection: None
           Frame: [0,<>temp0,Illegal]
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
         IntegerLiteralNode SourceSection: [8,9]`1`
           Value: 1
       WriteNameNodeGen SourceSection: None
         Identifier: a
         ReadLocalVariableNode SourceSection: None
           Frame: [0,<>temp0,Illegal]
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
           ReadVariableFromFrameNodeGen SourceSection: None
       WriteNameNodeGen SourceSection: None
         Identifier: b
         ReadLocalVariableNode SourceSection: None
           Frame: [0,<>temp0,Illegal]
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
           ReadVariableFromFrameNodeGen SourceSection: None
       EmptyNode SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment03.tast

@@ -14,6 +14,8 @@ ModuleRootNode Name: <module 'assignment03'> SourceSection: [0,25]`a = 0↵b = a
         Identifier: b
         ReadNameNodeGen SourceSection: [10,11]`a`
           Identifier: a
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
       ExpressionWithSideEffect SourceSection: None
         Expression:
           EmptyNode SourceSection: None
@@ -28,7 +30,13 @@ ModuleRootNode Name: <module 'assignment03'> SourceSection: [0,25]`a = 0↵b = a
                   Op: __add__
                 ReadNameNodeGen SourceSection: [16,17]`a`
                   Identifier: a
+                  IsBuiltinClassProfile SourceSection: None
+                    CachedDispatchFirst SourceSection: None
                 ReadNameNodeGen SourceSection: [20,21]`a`
                   Identifier: a
+                  IsBuiltinClassProfile SourceSection: None
+                    CachedDispatchFirst SourceSection: None
               ReadNameNodeGen SourceSection: [24,25]`b`
                 Identifier: b
+                IsBuiltinClassProfile SourceSection: None
+                  CachedDispatchFirst SourceSection: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment04.tast

@@ -10,26 +10,38 @@ ModuleRootNode Name: <module 'assignment04'> SourceSection: [0,17]`a = b = c = d
         Identifier: <>temp0
         WriteLocalFrameSlotNodeGen SourceSection: None
           Frame: [0,<>temp0,Illegal]
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
         ReadNameNodeGen SourceSection: [16,17]`e`
           Identifier: e
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
       WriteNameNodeGen SourceSection: None
         Identifier: a
         ReadLocalVariableNode SourceSection: None
           Frame: [0,<>temp0,Illegal]
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
           ReadVariableFromFrameNodeGen SourceSection: None
       WriteNameNodeGen SourceSection: None
         Identifier: b
         ReadLocalVariableNode SourceSection: None
           Frame: [0,<>temp0,Illegal]
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
           ReadVariableFromFrameNodeGen SourceSection: None
       WriteNameNodeGen SourceSection: None
         Identifier: c
         ReadLocalVariableNode SourceSection: None
           Frame: [0,<>temp0,Illegal]
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
           ReadVariableFromFrameNodeGen SourceSection: None
       WriteNameNodeGen SourceSection: None
         Identifier: d
         ReadLocalVariableNode SourceSection: None
           Frame: [0,<>temp0,Illegal]
+          IsBuiltinClassProfile SourceSection: None
+            CachedDispatchFirst SourceSection: None
           ReadVariableFromFrameNodeGen SourceSection: None
       EmptyNode SourceSection: None