Merge branch 'master' into feature/GR-18284

# Conflicts:
#	graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

Author: ppisl

SECURITY.md

@@ -0,0 +1,37 @@
+# Reporting Security Vulnerabilities
+
+The GraalVM team values the independent security research community and believes
+that responsible disclosure of security vulnerabilities in GraalVM Community
+Edition as well as GraalVM Enterprise Edition helps us ensure the security and
+privacy of all our users.
+
+If you believe you have found a security vulnerability, please submit a report
+to [email protected] preferably with a proof of concept. Please refer to
+[Reporting
+Vulnerabilities](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html)
+for additional information including our public encryption key for secure
+email. We ask that you do not contact project contributors directly or through
+other channels about a report.
+
+### Security Updates, Alerts and Bulletins
+
+GraalVM Community Edition security updates will be released on a quarterly basis
+in conjunction withe GraalVM Enterprise Edition security updates that are part
+of the Oracle Critical Patch Update program. Security updates are released on
+the Tuesday closest to the 17th day of January, April, July and October. A
+pre-release announcement will be published on the Thursday preceding each
+Critical Patch Update release. For additional information including past
+advisories, please refer to [Security
+Alerts](https://www.oracle.com/security-alerts/).
+
+### Security-Related Information
+
+Please refer to the [GraalVM Security
+Guide](https://www.graalvm.org/docs/security-guide/) for security related topics
+such as how to support trusted and less trusted code execution using the Truffle
+language framework, or compiler mitigations for transitive execution
+attacks. However please note that we do not currently support the execution of
+untrusted or adversarial code. Non-vulnerability related security issues may be
+discussed on GitHub Issues or the Security channel in the [GraalVM Slack
+Workspace](https://graalvm.slack.com/)
+

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "6e0694bba348c69f01d4fb3f7d7ad2e128a93e94" }
+{ "overlay": "c949a434d869d789978d54fd6f3e8ebe3a03c82a" }

graalpython/com.oracle.graal.python.benchmarks/python/meso/raytrace-simple.py

@@ -351,7 +351,7 @@ def baseColourAt(self, p):
         else:
             return self.baseColour
 
-def _main(width=150, height=150):
+def _main(width=400, height=400):
     Canvas = PpmCanvas
     c = Canvas(width,height)
     s = Scene()

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/ConsoleHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -88,12 +88,15 @@ public void setHistory(BooleanSupplier shouldRecord, IntSupplier getSize, Consum
     public InputStream createInputStream() {
         return new InputStream() {
             byte[] buffer = null;
-            int pos = -1;
+            int pos = 0;
 
             @Override
             public int read() throws IOException {
-                if (buffer == null) {
+                if (pos < 0) {
                     pos = 0;
+                    return -1;
+                } else if (buffer == null) {
+                    assert pos == 0;
                     String line = readLine(false);
                     if (line == null) {
                         return -1;
@@ -102,6 +105,7 @@ public int read() throws IOException {
                 }
                 if (pos == buffer.length) {
                     buffer = null;
+                    pos = -1;
                     return '\n';
                 } else {
                     return buffer[pos++];

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, 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.
@@ -54,36 +54,78 @@ public void del() {
         assertPrints("{3: 4}\n", source);
     }
 
+    @Test
+    public void dict() {
+        String source = "print(type({}))\n" +
+                        "print(type(iter({1: 'a', 2: 'b'})))\n" +
+                        "print({})\n" +
+                        "print({1: 'a'})\n" +
+                        "print({1: 'a', 2: 'b'})\n";
+
+        assertPrints("<class 'dict'>\n" +
+                        "<class 'dict_keyiterator'>\n" +
+                        "{}\n" +
+                        "{1: 'a'}\n" +
+                        "{1: 'a', 2: 'b'}\n", source);
+
+        source = "d = {1: 1}\n" +
+                        "d.__setitem__(2, d)\n" +
+                        "print(d)\n";
+        assertPrints("{1: 1, 2: {...}}\n", source);
+    }
+
     @Test
     public void dictViewKeys() {
         String source = "print(type({}.keys()))\n" +
                         "print(type(iter({1: 'a', 2: 'b'}.keys())))\n" +
+                        "print({}.keys())\n" +
+                        "print({1: 'a'}.keys())\n" +
                         "print({1: 'a', 2: 'b'}.keys())\n";
 
         assertPrints("<class 'dict_keys'>\n" +
-                        "<class 'dict_keysiterator'>\n" +
+                        "<class 'dict_keyiterator'>\n" +
+                        "dict_keys([])\n" +
+                        "dict_keys([1])\n" +
                         "dict_keys([1, 2])\n", source);
     }
 
     @Test
     public void dictViewValues() {
         String source = "print(type({}.values()))\n" +
                         "print(type(iter({1: 'a', 2: 'b'}.values())))\n" +
+                        "print({}.values())\n" +
+                        "print({1: 'a'}.values())\n" +
                         "print({1: 'a', 2: 'b'}.values())\n";
 
         assertPrints("<class 'dict_values'>\n" +
-                        "<class 'dict_valuesiterator'>\n" +
+                        "<class 'dict_valueiterator'>\n" +
+                        "dict_values([])\n" +
+                        "dict_values(['a'])\n" +
                         "dict_values(['a', 'b'])\n", source);
+
+        source = "d = {1: 1}\n" +
+                        "d.__setitem__(2, d)\n" +
+                        "print(d.values())\n";
+        assertPrints("dict_values([1, {1: 1, 2: {...}}])\n", source);
     }
 
     @Test
     public void dictViewItems() {
         String source = "print(type({}.items()))\n" +
                         "print(type(iter({1: 'a', 2: 'b'}.items())))\n" +
+                        "print({}.items())\n" +
+                        "print({1: 'a'}.items())\n" +
                         "print({1: 'a', 2: 'b'}.items())\n";
 
         assertPrints("<class 'dict_items'>\n" +
-                        "<class 'dict_itemsiterator'>\n" +
+                        "<class 'dict_itemiterator'>\n" +
+                        "dict_items([])\n" +
+                        "dict_items([(1, 'a')])\n" +
                         "dict_items([(1, 'a'), (2, 'b')])\n", source);
+
+        source = "d = {1: 1}\n" +
+                        "d.__setitem__(2, d)\n" +
+                        "print(d.items())\n";
+        assertPrints("dict_items([(1, 1), (2, {1: 1, 2: {...}})])\n", source);
     }
 }

graalpython/com.oracle.graal.python.test/src/graalpytest.py

@@ -117,10 +117,21 @@ def __init__(self):
         self.passed = 0
         self.failed = 0
 
+    def get_useful_frame(self, tb):
+        from traceback import extract_tb
+        frame_summaries = extract_tb(tb)
+        frame_summaries.reverse()
+        for summary in frame_summaries:
+            # Skip frame summary entries that refer to this file. These summaries will mostly be there because of the
+            # assert functions and their location is not interesting.
+            if summary[0] != __file__:
+                return summary
+
+
     def run_safely(self, func, print_immediately=False):
         if verbose:
             with print_lock:
-                print(u"\n\t\u21B3 ", func.__name__, " ", end="")
+                print(u"\n\t\u21B3 ", func.__name__, " ", end="", flush=True)
         try:
             func()
         except BaseException as e:
@@ -132,8 +143,7 @@ def run_safely(self, func, print_immediately=False):
                 code = func.__code__
                 _, _, tb = sys.exc_info()
                 try:
-                    from traceback import extract_tb
-                    filename, line, func, text = extract_tb(tb)[-1]
+                    filename, line, func, text = self.get_useful_frame(tb)
                     self.exceptions.append(
                         ("In test '%s': %s:%d (%s)" % (code.co_filename, filename, line, func), e)
                     )
@@ -152,18 +162,24 @@ def run_test(self, func):
             pass
         else:
             def do_run():
+                start = time.monotonic()
                 r = self.run_safely(func)
+                end = time.monotonic() - start
                 with print_lock:
-                    self.success() if r else self.failure()
+                    self.success(end) if r else self.failure(end)
             ThreadPool.start(do_run)
 
-    def success(self):
+    def success(self, time):
         self.passed += 1
+        if verbose:
+            print("[%.3fs]" % time, end=" ")
         print(".", end="", flush=True)
 
-    def failure(self):
+    def failure(self, time):
         self.failed += 1
         fail_msg = FAIL + BOLD + "F" + ENDC if verbose else "F"
+        if verbose:
+            print("[%.3fs]" % time, end=" ")
         print(fail_msg, end="", flush=True)
 
     def assertIsInstance(self, value, cls):
@@ -213,6 +229,11 @@ def assertGreater(self, expected, actual, msg=None):
             msg = "Expected '%r' to be greater than '%r'" % (actual, expected)
         assert expected > actual, msg
 
+    def assertGreaterEqual(self, expected, actual, msg=None):
+        if not msg:
+            msg = "Expected '%r' to be greater than or equal to '%r'" % (actual, expected)
+        assert expected >= actual, msg
+
     def assertSequenceEqual(self, expected, actual, msg=None):
         if not msg:
             msg = "Expected '%r' to be equal to '%r'" % (actual, expected)

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

@@ -103,6 +103,24 @@ def test_fromkeys():
     assert set(d.keys()) == {'a', 'b', 'c'}
     assert set(d.values()) == {o}
 
+    class preset(dict):
+        def __init__(self):
+            self['a'] = 1
+    assert preset.fromkeys(['b']) == {'a':1, 'b':None}        
+        
+    class morethanoneinitargraiseserror(dict):        
+        def __init__(self, anotherArg):
+            self.__init__()        
+    assert_raises(TypeError, morethanoneinitargraiseserror.fromkeys, [1])
+    
+    class nosetitem:
+        pass
+
+    class nosetitem2(dict):
+        def __new__(cls):
+            return nosetitem()
+    assert_raises(TypeError, nosetitem2.fromkeys, [1])
+
 
 def test_init():
     d = dict(a=1, b=2, c=3)