Merge branch 'master' into feature/GR-20901

# Conflicts:
#	graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeNodes.java

Author: ppisl

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "9f88a237b49801c25c4633e22d9a95c38032f9f2" }
+{ "overlay": "342d54c7c779683771fd346ae919235334523e58" }

graalpython/com.oracle.graal.python.benchmarks/python/micro/try-except-sized.py

@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+package com.oracle.graal.python.test.objects;
+
+import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+
+import com.oracle.graal.python.test.PythonTests;
+import java.util.concurrent.Callable;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.proxy.ProxyExecutable;
+import org.junit.After;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
+
+public class PythonObjectLibraryTests extends PythonTests {
+
+    private Context context;
+
+    @Before
+    public void setUpTest() {
+        Context.Builder builder = Context.newBuilder();
+        builder.allowExperimentalOptions(true);
+        builder.allowAllAccess(true);
+        context = builder.build();
+    }
+
+    @After
+    public void tearDown() {
+        context.close();
+    }
+
+    @Test
+    public void testLookupAttribute() {
+        lookupAttr(() -> true, "__str__", false);
+        lookupAttr(() -> 1.1, "__str__", false);
+        lookupAttr(() -> 1, "__str__", false);
+        lookupAttr(() -> (long) 1, "__str__", false);
+        lookupAttr(() -> "abc", "__str__", false);
+
+        lookupAttr(() -> new Object(), "__str__", true);
+
+        lookupAttr(() -> PythonObjectFactory.getUncached().createInt(1), "__str__", false);
+
+        String noSuchMethod = "__nnoossuuttschmeethod__";
+        lookupAttr(() -> true, noSuchMethod, true);
+        lookupAttr(() -> 1.1, noSuchMethod, true);
+        lookupAttr(() -> 1, noSuchMethod, true);
+        lookupAttr(() -> (long) 1, "__strt__", true);
+        lookupAttr(() -> "abc", noSuchMethod, true);
+    }
+
+    private void lookupAttr(Callable<Object> createValue, String attrName, boolean expectNoValue) {
+        PythonObjectLibrary lib = PythonObjectLibrary.getFactory().getUncached();
+        execInContext(() -> {
+            Object value = createValue.call();
+            Object attr = lib.lookupAttribute(value, attrName, false);
+            assertAttr(attr, expectNoValue);
+
+            attr = lib.lookupAttribute(value, attrName, true);
+            assertAttr(attr, expectNoValue);
+            return null;
+        });
+    }
+
+    private static void assertAttr(Object attr, boolean expectNoValue) {
+        assertNotNull(attr);
+        if (expectNoValue) {
+            assertSame(PNone.NO_VALUE, attr);
+        } else {
+            assertNotSame(PNone.NO_VALUE, attr);
+        }
+    }
+
+    public void execInContext(Callable<Object> c) {
+        context.initialize("python");
+        context.getPolyglotBindings().putMember("testSymbol", (ProxyExecutable) (Value... args) -> {
+            try {
+                return c.call();
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                fail();
+            }
+            return null;
+        });
+        context.getPolyglotBindings().getMember("testSymbol").execute();
+    }
+
+}

graalpython/com.oracle.graal.python.benchmarks/python/micro/try-except-store-sized.py

@@ -37,6 +37,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import unittest
 
 def assert_raises(err, fn, *args, **kwargs):
     raised = False
@@ -117,3 +118,30 @@ def __init__(self):
         id(a) # id is stored in a HiddenKey
 
     return
+
+class IllegaAssigmentTest(unittest.TestCase):
+    def test_illegal_assignment(self):
+        with self.assertRaisesRegex(SyntaxError, "assign to function call"):
+            compile("a() = 1", "<test>", "exec")
+
+        with self.assertRaisesRegex(SyntaxError, "assign to function call"):
+            compile("a() += 1", "<test>", "exec")
+
+        with self.assertRaisesRegex(SyntaxError, "assign to function call"):
+            str = "def set() :\n\tprint(42)\n\nset() = 5"
+            compile(str, "<test>", "exec")
+
+        with self.assertRaisesRegex(SyntaxError, "assign to function call"):
+            compile("a(), b, c = (1, 2, 3)", "<test>", "exec")
+
+        with self.assertRaisesRegex(SyntaxError, "assign to function call"):
+            compile("a, b(), c = (1, 2, 3)", "<test>", "exec")
+
+        with self.assertRaisesRegex(SyntaxError, "assign to dict comprehension"):
+            compile("{s:s for s in [1]}, b, c = (1, 2, 3)", "<test>", "exec")
+
+        with self.assertRaisesRegex(SyntaxError, "assign to set comprehension"):
+            compile("{s for s in [1]}, b, c = (1, 2, 3)", "<test>", "exec")
+
+        with self.assertRaisesRegex(SyntaxError, "assign to list comprehension"):
+            compile("[s for s in [1]], b, c = (1, 2, 3)", "<test>", "exec")

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/objects/PythonObjectLibraryTests.java

@@ -6,5 +6,6 @@
 *DispatcherTests.test_unhandled
 *HelperFunctionTests.test_closeall
 *HelperFunctionTests.test_closeall_default
+*HelperFunctionTests.test_compact_traceback
 *HelperFunctionTests.test_readwrite
 *HelperFunctionTests.test_readwriteexc

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

@@ -0,0 +1,7 @@
+*AugAssignTest.testBasic
+*AugAssignTest.testCustomMethods1
+*AugAssignTest.testCustomMethods2
+*AugAssignTest.testInDict
+*AugAssignTest.testInList
+*AugAssignTest.testSequences
+*AugAssignTest.test_with_unpacking

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_asyncore.txt

@@ -8,6 +8,7 @@
 *TestCollectionABCs.test_ByteString
 *TestCollectionABCs.test_MutableMapping_subclass
 *TestCollectionABCs.test_MutableSequence_mixins
+*TestCollectionABCs.test_Sequence_mixins
 *TestCollectionABCs.test_arithmetic_Set
 *TestCollectionABCs.test_equality_Set
 *TestCollectionABCs.test_hash_Set

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_augassign.txt

@@ -30,6 +30,11 @@
 *CoverageOneHundredTestCase.test_readfp_deprecation
 *CoverageOneHundredTestCase.test_safeconfigparser_deprecation
 *CoverageOneHundredTestCase.test_sectionproxy_repr
+*ExceptionContextTestCase.test_get_basic_interpolation
+*ExceptionContextTestCase.test_get_extended_interpolation
+*ExceptionContextTestCase.test_missing_options
+*ExceptionContextTestCase.test_missing_section
+*ExceptionContextTestCase.test_remove_option
 *InlineCommentStrippingTestCase.test_stripping
 *Issue7005TestCase.test_none_as_value_stringified
 *Issue7005TestCase.test_none_as_value_stringified_raw

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_collections.txt

@@ -7,6 +7,7 @@
 *ContextManagerTestCase.test_contextmanager_except
 *ContextManagerTestCase.test_contextmanager_except_stopiter
 *ContextManagerTestCase.test_contextmanager_finally
+*ContextManagerTestCase.test_contextmanager_no_reraise
 *ContextManagerTestCase.test_contextmanager_plain
 *ContextManagerTestCase.test_contextmanager_trap_yield_after_throw
 *ContextManagerTestCase.test_instance_docstring_given_cm_docstring
@@ -31,3 +32,12 @@
 *TestContextDecorator.test_instance_docs
 *TestContextDecorator.test_typo_enter
 *TestContextDecorator.test_typo_exit
+*TestSuppress.test_cm_is_reentrant
+*TestSuppress.test_exact_exception
+*TestSuppress.test_exception_hierarchy
+*TestSuppress.test_instance_docs
+*TestSuppress.test_multiple_exception_args
+*TestSuppress.test_no_args
+*TestSuppress.test_no_exception
+*TestSuppress.test_no_result_from_enter
+*TestSuppress.test_other_exception