Add SequenceStorage Nodes

Author: qunaibit

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java

@@ -56,6 +56,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorage.DictEntry;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes.GetObjectArrayNode;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
@@ -402,9 +403,10 @@ void handlePTuple(VirtualFrame frame, PTuple t, int version, DataOutputStream bu
         }
 
         @Specialization
-        void handlePList(VirtualFrame frame, PList l, int version, DataOutputStream buffer) {
+        void handlePList(VirtualFrame frame, PList l, int version, DataOutputStream buffer,
+                        @Cached SequenceStorageNodes.GetInternalObjectArrayNode getArray) {
             writeByte(TYPE_LIST, version, buffer);
-            Object[] items = l.getSequenceStorage().getInternalArray();
+            Object[] items = getArray.execute(l.getSequenceStorage());
             writeInt(items.length, version, buffer);
             for (int i = 0; i < items.length; i++) {
                 getRecursiveNode().execute(frame, items[i], version, buffer);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixSubprocessModuleBuiltins.java

@@ -59,6 +59,7 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum;
 import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum.ErrorAndMessagePair;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
@@ -101,18 +102,18 @@ abstract static class ForkExecNode extends PythonBuiltinNode {
         @Child private BytesNodes.ToBytesNode toBytes = BytesNodes.ToBytesNode.create();
 
         @Specialization
-        @SuppressWarnings("try")
         int forkExec(VirtualFrame frame, PList args, @SuppressWarnings("unused") PList execList, @SuppressWarnings("unused") boolean closeFds,
                         @SuppressWarnings("unused") PList fdsToKeep, String cwd, PList env,
                         int p2cread, int p2cwrite, int c2pread, int c2pwrite,
                         int errread, int errwrite, @SuppressWarnings("unused") int errpipe_read, int errpipe_write,
-                        @SuppressWarnings("unused") boolean restore_signals, @SuppressWarnings("unused") boolean call_setsid, @SuppressWarnings("unused") PNone preexec_fn) {
+                        @SuppressWarnings("unused") boolean restore_signals, @SuppressWarnings("unused") boolean call_setsid, @SuppressWarnings("unused") PNone preexec_fn,
+                        @Cached SequenceStorageNodes.CopyInternalArrayNode copy) {
 
             PythonContext context = getContext();
             Object state = IndirectCallContext.enter(frame, context, this);
             try {
                 return forkExec(args, execList, closeFds, fdsToKeep, cwd, env, p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite, errpipe_read, errpipe_write, restore_signals, call_setsid,
-                                preexec_fn);
+                                preexec_fn, copy);
             } finally {
                 IndirectCallContext.exit(frame, context, state);
             }
@@ -123,15 +124,16 @@ private synchronized int forkExec(PList args, @SuppressWarnings("unused") PList
                         @SuppressWarnings("unused") PList fdsToKeep, String cwd, PList env,
                         int p2cread, int p2cwrite, int c2pread, int c2pwrite,
                         int errread, int errwrite, @SuppressWarnings("unused") int errpipe_read, int errpipe_write,
-                        @SuppressWarnings("unused") boolean restore_signals, @SuppressWarnings("unused") boolean call_setsid, @SuppressWarnings("unused") PNone preexec_fn) {
+                        @SuppressWarnings("unused") boolean restore_signals, @SuppressWarnings("unused") boolean call_setsid, @SuppressWarnings("unused") PNone preexec_fn,
+                        @Cached SequenceStorageNodes.CopyInternalArrayNode copy) {
             PythonContext context = getContext();
             PosixResources resources = context.getResources();
             if (!context.isExecutableAccessAllowed()) {
                 return -1;
             }
 
             ArrayList<String> argStrings = new ArrayList<>();
-            Object[] copyOfInternalArray = args.getSequenceStorage().getCopyOfInternalArray();
+            Object[] copyOfInternalArray = copy.execute(args.getSequenceStorage());
             for (Object o : copyOfInternalArray) {
                 if (o instanceof String) {
                     argStrings.add((String) o);
@@ -249,6 +251,7 @@ int forkExecDefault(VirtualFrame frame, Object args, Object executable_list, Obj
                         @Cached CastToListNode castFdsToKeep,
                         @Cached CastToJavaStringNode castCwd,
                         @Cached CastToListNode castEnv,
+                        @Cached SequenceStorageNodes.CopyInternalArrayNode copy,
                         @CachedLibrary(limit = "3") PythonObjectLibrary lib) {
 
             String actualCwd;
@@ -281,7 +284,7 @@ int forkExecDefault(VirtualFrame frame, Object args, Object executable_list, Obj
                             lib.asSizeWithState(errpipe_read, PArguments.getThreadState(frame)),
                             lib.asSizeWithState(errpipe_write, PArguments.getThreadState(frame)),
                             lib.isTrueWithState(restore_signals, PArguments.getThreadState(frame)),
-                            lib.isTrueWithState(call_setsid, PArguments.getThreadState(frame)), preexec_fn);
+                            lib.isTrueWithState(call_setsid, PArguments.getThreadState(frame)), preexec_fn, copy);
         }
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceNodes.java

@@ -125,9 +125,23 @@ static Object[] doGeneric(Object seq,
                         @Cached SequenceStorageNodes.ToArrayNode toArrayNode) {
             return toArrayNode.execute(getSequenceStorageNode.execute(seq));
         }
+    }
+
+    @GenerateUncached
+    public abstract static class SetSequenceStorageNode extends Node {
+
+        public abstract void execute(PSequence s, SequenceStorage storage);
+
+        @Specialization(guards = "s.getClass() == cachedClass")
+        static void doSpecial(PSequence s, SequenceStorage storage,
+                        @Cached("s.getClass()") Class<? extends PSequence> cachedClass) {
+            cachedClass.cast(s).setSequenceStorage(storage);
+        }
 
-        public static GetObjectArrayNode create() {
-            return SequenceNodesFactory.GetObjectArrayNodeGen.create();
+        @Specialization(replaces = "doSpecial")
+        @CompilerDirectives.TruffleBoundary
+        static void doGeneric(PSequence s, SequenceStorage storage) {
+            s.setSequenceStorage(storage);
         }
     }
 }