[hotfix] Disable ast reuse

timfel · timfel · commit 8b6009ffa737 · 2018-08-13T01:54:39.000-07:00
PullRequest: graalpython/157
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java
@@ -76,7 +76,7 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.Source.Builder;
 
-@TruffleLanguage.Registration(id = PythonLanguage.ID, name = PythonLanguage.NAME, version = PythonLanguage.VERSION, mimeType = PythonLanguage.MIME_TYPE, interactive = true, internal = false, contextPolicy = TruffleLanguage.ContextPolicy.REUSE)
+@TruffleLanguage.Registration(id = PythonLanguage.ID, name = PythonLanguage.NAME, version = PythonLanguage.VERSION, mimeType = PythonLanguage.MIME_TYPE, interactive = true, internal = false, contextPolicy = TruffleLanguage.ContextPolicy.EXCLUSIVE)
 @ProvidedTags({StandardTags.CallTag.class, StandardTags.StatementTag.class, StandardTags.RootTag.class, StandardTags.TryBlockTag.class, DebuggerTags.AlwaysHalt.class})
 public final class PythonLanguage extends TruffleLanguage<PythonContext> {
     public static final String ID = "python";
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java
@@ -150,7 +150,7 @@ public abstract static class CreateDynamic extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
         public Object run(PythonObject moduleSpec, @SuppressWarnings("unused") Object filename,
-                        @Cached("createExecute(0).createNode()") Node executeNode,
+                        @Cached("EXECUTE.createNode()") Node executeNode,
                         @Cached("READ.createNode()") Node readNode) {
             String name = moduleSpec.getAttribute("name").toString();
             String path = moduleSpec.getAttribute("origin").toString();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/InteropModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/InteropModuleBuiltins.java
@@ -227,7 +227,7 @@ Object remove(TruffleObject receiver, Object key,
     public abstract static class executeNode extends PythonBuiltinNode {
         @Specialization
         Object remove(TruffleObject receiver, Object[] arguments,
-                        @Cached("createExecute(0).createNode()") Node executeNode) {
+                        @Cached("EXECUTE.createNode()") Node executeNode) {
             try {
                 return ForeignAccess.sendExecute(executeNode, receiver, arguments);
             } catch (UnsupportedMessageException | UnsupportedTypeException | ArityException e) {
@@ -242,7 +242,7 @@ Object remove(TruffleObject receiver, Object[] arguments,
     public abstract static class newNode extends PythonBuiltinNode {
         @Specialization
         Object remove(TruffleObject receiver, Object[] arguments,
-                        @Cached("createNew(0).createNode()") Node executeNode) {
+                        @Cached("NEW.createNode()") Node executeNode) {
             try {
                 return ForeignAccess.sendNew(executeNode, receiver, arguments);
             } catch (UnsupportedMessageException | UnsupportedTypeException | ArityException e) {
@@ -257,7 +257,7 @@ Object remove(TruffleObject receiver, Object[] arguments,
     public abstract static class invokeNode extends PythonBuiltinNode {
         @Specialization
         Object remove(TruffleObject receiver, String key, Object[] arguments,
-                        @Cached("createInvoke(0).createNode()") Node executeNode) {
+                        @Cached("INVOKE.createNode()") Node executeNode) {
             try {
                 return ForeignAccess.sendInvoke(executeNode, receiver, key, arguments);
             } catch (UnsupportedMessageException | UnsupportedTypeException | ArityException | UnknownIdentifierException e) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java
@@ -273,7 +273,7 @@ Object call(TruffleObject callable, Object[] arguments,
         }
 
         protected static Node createExecute() {
-            return Message.createExecute(0).createNode();
+            return Message.EXECUTE.createNode();
         }
 
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -595,11 +595,7 @@ public ExternalFunctionNode(PythonLanguage lang, String name, TruffleObject cwra
             this.name = name;
             this.cwrapper = cwrapper;
             this.callable = callable;
-            if (cwrapper != null) {
-                this.executeNode = Message.createExecute(3).createNode();
-            } else {
-                this.executeNode = Message.createExecute(2).createNode();
-            }
+            this.executeNode = Message.EXECUTE.createNode();
         }
 
         public TruffleObject getCallable() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java
@@ -87,7 +87,7 @@ public abstract class CExtNodes {
      */
     public static class SubtypeNew extends PBaseNode {
         private final TruffleObject subtypeFunc;
-        @Child private Node executeNode = Message.createExecute(2).createNode();
+        @Child private Node executeNode = Message.EXECUTE.createNode();
         @Child private ToSulongNode toSulongNode = ToSulongNode.create();
         @Child private ToJavaNode toJavaNode = ToJavaNode.create();
 
@@ -134,7 +134,7 @@ private PythonBuiltinClass getExpectedClass() {
         private Node getExecNode() {
             if (executeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                executeNode = insert(Message.createExecute(1).createNode());
+                executeNode = insert(Message.EXECUTE.createNode());
             }
             return executeNode;
         }
@@ -362,7 +362,7 @@ Object doWrapper(PythonObjectNativeWrapper value) {
         Object doForeign(Object value) {
             if (callNativeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callNativeNode = insert(PCallNativeNode.create(1));
+                callNativeNode = insert(PCallNativeNode.create());
             }
             if (callNativeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -388,13 +388,13 @@ public abstract static class AsCharPointer extends CExtBaseNode {
 
         @Specialization
         Object doPString(PString str,
-                        @Cached("createExecute(1)") Node executeNode) {
+                        @Cached("createExecute()") Node executeNode) {
             return doString(str.getValue(), executeNode);
         }
 
         @Specialization
         Object doString(String str,
-                        @Cached("createExecute(1)") Node executeNode) {
+                        @Cached("createExecute()") Node executeNode) {
             try {
                 return ForeignAccess.sendExecute(executeNode, getTruffleStringToCstr(), str, str.length());
             } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
@@ -404,7 +404,7 @@ Object doString(String str,
 
         @Specialization
         Object doByteArray(byte[] arr,
-                        @Cached("createExecute(2)") Node executeNode) {
+                        @Cached("createExecute()") Node executeNode) {
             try {
                 return ForeignAccess.sendExecute(executeNode, getTruffleByteArrayToNative(), getContext().getEnv().asGuestValue(arr), arr.length);
             } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
@@ -428,8 +428,8 @@ TruffleObject getTruffleByteArrayToNative() {
             return truffle_byte_array_to_native;
         }
 
-        protected Node createExecute(int arity) {
-            return Message.createExecute(arity).createNode();
+        protected Node createExecute() {
+            return Message.EXECUTE.createNode();
         }
 
         public static AsCharPointer create() {
@@ -453,7 +453,7 @@ TruffleObject getTruffleStringToCstr() {
         private Node getExecuteNode() {
             if (executeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                executeNode = insert(Message.createExecute(1).createNode());
+                executeNode = insert(Message.EXECUTE.createNode());
             }
             return executeNode;
         }
@@ -495,7 +495,7 @@ private ToJavaNode getToJavaNode() {
         private PCallNativeNode getCallGetObTypeNode() {
             if (callGetObTypeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callGetObTypeNode = insert(PCallNativeNode.create(1));
+                callGetObTypeNode = insert(PCallNativeNode.create());
             }
             return callGetObTypeNode;
         }
@@ -521,7 +521,7 @@ public long execute() {
             if (wcharSize < 0) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 try {
-                    wcharSize = (long) ForeignAccess.sendExecute(Message.createExecute(0).createNode(), getNativeFunction());
+                    wcharSize = (long) ForeignAccess.sendExecute(Message.EXECUTE.createNode(), getNativeFunction());
                     assert wcharSize >= 0L;
                 } catch (InteropException e) {
                     throw e.raise();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PCallNativeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PCallNativeNode.java
@@ -51,18 +51,12 @@
 import com.oracle.truffle.api.nodes.Node;
 
 public class PCallNativeNode extends PBaseNode {
-    private final int arity;
-
     @Child private Node executeNode;
 
-    public PCallNativeNode(int arity) {
-        this.arity = arity;
-    }
-
     private Node getExecuteNode() {
         if (executeNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            executeNode = insert(Message.createExecute(arity).createNode());
+            executeNode = insert(Message.EXECUTE.createNode());
         }
         return executeNode;
     }
@@ -76,7 +70,7 @@ public Object execute(TruffleObject func, Object[] args) {
         }
     }
 
-    public static PCallNativeNode create(int arity) {
-        return new PCallNativeNode(arity);
+    public static PCallNativeNode create() {
+        return new PCallNativeNode();
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java
@@ -313,7 +313,7 @@ protected boolean isNonNative(PythonClass klass) {
         private Object callBinaryIntoCapi(TruffleObject fun, Object arg0, Object arg1) {
             if (callNativeBinary == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callNativeBinary = insert(PCallNativeNode.create(1));
+                callNativeBinary = insert(PCallNativeNode.create());
             }
             return callNativeBinary.execute(fun, new Object[]{arg0, arg1});
         }
@@ -355,7 +355,7 @@ long access(PySequenceArrayWrapper obj) {
     @ImportStatic(SpecialMethodNames.class)
     abstract static class GetTypeIDNode extends PBaseNode {
 
-        @Child private PCallNativeNode callUnaryNode = PCallNativeNode.create(1);
+        @Child private PCallNativeNode callUnaryNode = PCallNativeNode.create();
 
         @CompilationFinal TruffleObject funGetByteArrayTypeID;
         @CompilationFinal TruffleObject funGetPtrArrayTypeID;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyUnicodeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyUnicodeWrapperMR.java
@@ -203,7 +203,7 @@ private TruffleObject getPyObjectHandle_ForJavaType() {
         private Object callUnaryIntoCapi(TruffleObject fun, Object arg) {
             if (callNativeUnary == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callNativeUnary = insert(PCallNativeNode.create(1));
+                callNativeUnary = insert(PCallNativeNode.create());
             }
             return callNativeUnary.execute(fun, new Object[]{arg});
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java
@@ -890,15 +890,15 @@ protected boolean isManagedPythonClass(PythonAbstractObject klass) {
         private Object callUnaryIntoCapi(TruffleObject fun, Object arg) {
             if (callNativeUnary == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callNativeUnary = insert(PCallNativeNode.create(1));
+                callNativeUnary = insert(PCallNativeNode.create());
             }
             return callNativeUnary.execute(fun, new Object[]{arg});
         }
 
         private Object callBinaryIntoCapi(TruffleObject fun, Object arg0, Object arg1) {
             if (callNativeBinary == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                callNativeBinary = insert(PCallNativeNode.create(1));
+                callNativeBinary = insert(PCallNativeNode.create());
             }
             return callNativeBinary.execute(fun, new Object[]{arg0, arg1});
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/TruffleObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/TruffleObjectBuiltins.java
@@ -783,7 +783,7 @@ abstract static class NewNode extends UnboxNode {
          */
         @Specialization(guards = {"isForeignObject(callee)", "!isNoValue(callee)", "keywords.length == 0"})
         protected Object doInteropCall(TruffleObject callee, Object[] arguments, @SuppressWarnings("unused") PKeyword[] keywords,
-                        @Cached("createNew(0).createNode()") Node newNode,
+                        @Cached("NEW.createNode()") Node newNode,
                         @Cached("create()") PTypeToForeignNode toForeignNode,
                         @Cached("create()") PForeignToPTypeNode toPTypeNode) {
             try {
@@ -814,8 +814,8 @@ public abstract static class CallNode extends UnboxNode {
         @Specialization(guards = {"isForeignObject(callee)", "!isNoValue(callee)", "keywords.length == 0"})
         protected Object doInteropCall(TruffleObject callee, Object[] arguments, @SuppressWarnings("unused") PKeyword[] keywords,
                         @Cached("IS_EXECUTABLE.createNode()") Node isExecutableNode,
-                        @Cached("createExecute(0).createNode()") Node executeNode,
-                        @Cached("createNew(0).createNode()") Node newNode,
+                        @Cached("EXECUTE.createNode()") Node executeNode,
+                        @Cached("NEW.createNode()") Node newNode,
                         @Cached("create()") PTypeToForeignNode toForeignNode,
                         @Cached("create()") PForeignToPTypeNode toPTypeNode) {
             try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/PythonCallNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/PythonCallNode.java
@@ -145,7 +145,7 @@ private PKeyword[] evaluateKeywords(VirtualFrame frame) {
     }
 
     protected static Node createInvoke() {
-        return Message.createInvoke(0).createNode();
+        return Message.INVOKE.createNode();
     }
 
     @Specialization
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/PythonNFICallNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/PythonNFICallNode.java
@@ -52,7 +52,7 @@
 
 public abstract class PythonNFICallNode extends PythonBuiltinNode {
     @Child private Node readNode = Message.READ.createNode();
-    @Child private Node bindNode = Message.createInvoke(3).createNode();
+    @Child private Node bindNode = Message.EXECUTE.createNode();
     @Child private Node executeNode;
 
     protected TruffleObject getDefaultLibrary() {
@@ -67,7 +67,7 @@ protected TruffleObject bind(TruffleObject library, String name, String signatur
     protected Object sendExecute(TruffleObject function, Object... arguments) throws UnsupportedTypeException, ArityException, UnsupportedMessageException {
         if (executeNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            executeNode = insert(Message.createExecute(arguments.length).createNode());
+            executeNode = insert(Message.EXECUTE.createNode());
         }
         return ForeignAccess.sendExecute(executeNode, function, arguments);
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/interop/PythonMessageResolution.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/interop/PythonMessageResolution.java
@@ -264,7 +264,7 @@ public Object execute(Object receiver, Object[] arguments) {
 
             Object profiledCallable = classProfile.profile(callable);
             if (profiledCallable == PNone.NO_VALUE) {
-                throw UnsupportedMessageException.raise(Message.createExecute(convertedArgs.length));
+                throw UnsupportedMessageException.raise(Message.EXECUTE);
             }
 
             PKeyword[] emptyKeywords = new PKeyword[0];
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -25,14 +25,14 @@
             },
             {
                 "name": "sulong",
-                "version": "d9d7dc0134eb899d622d672f1ab65a7cef613102",
+                "version": "7b974dcf1f66ca9dd9866ddff1db41614632a931",
                 "urls": [
                     {"url": "https://github.com/graalvm/sulong", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "dfa895ea17e9163024971ab617322066f98a939c",
+                "version": "9b276ba4d878a7664e57f356a90f291dfda22af5",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ Object call(TruffleObject callable, Object[] arguments,`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`protected static Node createExecute() {`
`276`		`- return Message.createExecute(0).createNode();`
	`276`	`+ return Message.EXECUTE.createNode();`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,18 +51,12 @@`
`51`	`51`	`import com.oracle.truffle.api.nodes.Node;`
`52`	`52`
`53`	`53`	`public class PCallNativeNode extends PBaseNode {`
`54`		`- private final int arity;`
`55`		`-`
`56`	`54`	`@Child private Node executeNode;`
`57`	`55`
`58`		`- public PCallNativeNode(int arity) {`
`59`		`- this.arity = arity;`
`60`		`- }`
`61`		`-`
`62`	`56`	`private Node getExecuteNode() {`
`63`	`57`	`if (executeNode == null) {`
`64`	`58`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`65`		`- executeNode = insert(Message.createExecute(arity).createNode());`
	`59`	`+ executeNode = insert(Message.EXECUTE.createNode());`
`66`	`60`	`}`
`67`	`61`	`return executeNode;`
`68`	`62`	`}`
`@@ -76,7 +70,7 @@ public Object execute(TruffleObject func, Object[] args) {`
`76`	`70`	`}`
`77`	`71`	`}`
`78`	`72`
`79`		`- public static PCallNativeNode create(int arity) {`
`80`		`- return new PCallNativeNode(arity);`
	`73`	`+ public static PCallNativeNode create() {`
	`74`	`+ return new PCallNativeNode();`
`81`	`75`	`}`
`82`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private TruffleObject getPyObjectHandle_ForJavaType() {`
`203`	`203`	`private Object callUnaryIntoCapi(TruffleObject fun, Object arg) {`
`204`	`204`	`if (callNativeUnary == null) {`
`205`	`205`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`206`		`- callNativeUnary = insert(PCallNativeNode.create(1));`
	`206`	`+ callNativeUnary = insert(PCallNativeNode.create());`
`207`	`207`	`}`
`208`	`208`	`return callNativeUnary.execute(fun, new Object[]{arg});`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -890,15 +890,15 @@ protected boolean isManagedPythonClass(PythonAbstractObject klass) {`
`890`	`890`	`private Object callUnaryIntoCapi(TruffleObject fun, Object arg) {`
`891`	`891`	`if (callNativeUnary == null) {`
`892`	`892`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`893`		`- callNativeUnary = insert(PCallNativeNode.create(1));`
	`893`	`+ callNativeUnary = insert(PCallNativeNode.create());`
`894`	`894`	`}`
`895`	`895`	`return callNativeUnary.execute(fun, new Object[]{arg});`
`896`	`896`	`}`
`897`	`897`
`898`	`898`	`private Object callBinaryIntoCapi(TruffleObject fun, Object arg0, Object arg1) {`
`899`	`899`	`if (callNativeBinary == null) {`
`900`	`900`	`CompilerDirectives.transferToInterpreterAndInvalidate();`
`901`		`- callNativeBinary = insert(PCallNativeNode.create(1));`
	`901`	`+ callNativeBinary = insert(PCallNativeNode.create());`
`902`	`902`	`}`
`903`	`903`	`return callNativeBinary.execute(fun, new Object[]{arg0, arg1});`
`904`	`904`	`}`