[GR-21590] [GR-20902] [GR-21507] Update to latest Truffle with new metaobject API

PullRequest: graalpython/840

Author: timfel

.gitignore

@@ -37,11 +37,6 @@ language
 *.dylib
 *.rej
 .checkstyle
-/graalpython/com.oracle.graal.python.cext/compile_flags.txt
-/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/*.interp
-/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/*.tokens
-/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3*.java
-/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3.g4.stamp
 /mx.imports
 .pydevproject
 ## local dev and debug files

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "7a921d86cdb241e190bb1ad2c6f924d1837c6fa3" }
+{ "overlay": "ba6e4e7720df9534bc6b608786ce45ba954661d7" }

graalpython/com.oracle.graal.python.cext/compile_flags.txt

@@ -0,0 +1,2 @@
+-Iinclude/
+-I../include/

graalpython/com.oracle.graal.python.parser.antlr/postprocess.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -43,7 +43,7 @@
 
 COPYRIGHT_HEADER = """\
 /*
- * Copyright (c) 2017-2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017-2020, Oracle and/or its affiliates.
  * Copyright (c) 2014 by Bart Kiers
  *
  * The MIT License (MIT)

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/debug/PythonDebugTest.java

@@ -424,8 +424,8 @@ public void testInspectJavaArray() throws Throwable {
             expectSuspended((SuspendedEvent event) -> {
                 DebugScope globalScope = session.getTopScope("python");
                 DebugValue intValue = globalScope.getDeclaredValue("a_int").getArray().get(0);
-                // It's up to Truffle to decide which language it uses for inspection of primitives,
-                // we should be fine as long as this doesn't throw an exception
+                // Truffle will now use our language to get a Python view on the primitive object
+                // for inspection
                 intValue.getMetaObject();
                 assertEquals("0", intValue.as(String.class));
                 DebugValue longValue = globalScope.getDeclaredValue("a_long").getArray().get(0);
@@ -445,7 +445,7 @@ public void testInspectJavaArray() throws Throwable {
                 assertEquals("0.0", doubleValue.as(String.class));
                 DebugValue charValue = globalScope.getDeclaredValue("a_char").getArray().get(0);
                 charValue.getMetaObject();
-                assertEquals("\0", charValue.as(String.class));
+                assertEquals("'\\x00'", charValue.as(String.class));
             });
         }
     }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/ReadAndWriteVariableTagsTests.java

@@ -40,7 +40,14 @@
  */
 package com.oracle.graal.python.test.interop;
 
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
 import com.oracle.graal.python.nodes.PNode;
+import com.oracle.graal.python.nodes.instrumentation.NodeObjectDescriptor;
 import com.oracle.graal.python.test.PythonTests;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.EventContext;
@@ -50,21 +57,18 @@
 import com.oracle.truffle.api.instrumentation.StandardTags;
 import com.oracle.truffle.api.instrumentation.TruffleInstrument;
 import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.LibraryFactory;
 import com.oracle.truffle.api.nodes.Node;
-import java.util.HashMap;
+
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.Instrument;
 import org.graalvm.polyglot.Source;
-import static org.junit.Assert.assertTrue;
-import com.oracle.graal.python.nodes.instrumentation.NodeObjectDescriptor;
-import com.oracle.truffle.api.interop.UnknownIdentifierException;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import java.util.HashSet;
-import java.util.Set;
 import org.junit.Test;
 
+@SuppressWarnings("all")
 public class ReadAndWriteVariableTagsTests extends PythonTests {
 
     static final InteropLibrary INTEROP = LibraryFactory.resolve(InteropLibrary.class).getUncached();

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/StandardTagsTests.java

@@ -40,6 +40,11 @@
  */
 package com.oracle.graal.python.test.interop;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.graal.python.nodes.function.InnerRootNode;
 import com.oracle.graal.python.test.PythonTests;
@@ -53,16 +58,15 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.LibraryFactory;
 import com.oracle.truffle.api.nodes.Node;
-import java.util.HashMap;
+
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.Instrument;
 import org.graalvm.polyglot.Source;
 import org.junit.Assert;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
 import org.junit.Test;
 
+@SuppressWarnings("all")
 public class StandardTagsTests extends PythonTests {
 
     static final InteropLibrary INTEROP = LibraryFactory.resolve(InteropLibrary.class).getUncached();

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/TimeDateTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -40,19 +40,24 @@
  */
 package com.oracle.graal.python.test.interop;
 
-import com.oracle.graal.python.test.PythonTests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
 import java.io.ByteArrayOutputStream;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZoneId;
+
+import com.oracle.graal.python.test.PythonTests;
+
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
 import org.junit.After;
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
+@SuppressWarnings("all")
 public class TimeDateTest extends PythonTests {
 
     private ByteArrayOutputStream out;