[GR-14937] Remove opaque filesystem

PullRequest: graalpython/481

Author: timfel

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

@@ -528,7 +528,6 @@ public String toString() {
         @Parameters(name = "{0}")
         public static OptionsChecker[] input() {
             return new OptionsChecker[]{
-                            new OptionsChecker("OpaqueFilesystem", "import sys; sys.graal_python_opaque_filesystem", "true", "false"),
                             new OptionsChecker("InspectFlag", "import sys; sys.flags.inspect", "true", "false"),
                             new OptionsChecker("QuietFlag", "import sys; sys.flags.quiet", "true", "false"),
                             new OptionsChecker("VerboseFlag", "import sys; sys.flags.verbose", "true", "false"),

graalpython/com.oracle.graal.python.test/src/tests/cpyext/__init__.py

@@ -71,12 +71,6 @@ def setUp(self):
 
 
 def ccompile(self, name):
-    if getattr(sys, "graal_python_opaque_filesystem", False):
-        # distutils won't fully work with an opaque filesystem,
-        # because we cannot read bytes from files and manipulate
-        # them. We hope the code was already compiled.
-        return
-
     from distutils.core import setup, Extension
     source_file = '%s/%s.c' % (__dir__, name)
     file_not_empty(source_file)

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_err.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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
@@ -152,24 +152,23 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
-    if not getattr(sys, "graal_python_opaque_filesystem", False):
-        test_PyErr_PrintEx = CPyExtFunction(
-            lambda args: None,
-            lambda: (
-                (True,),
-            ),
-            code="""PyObject* wrap_PyErr_PrintEx(int n) {
-                 PyErr_SetString(PyExc_KeyError, "unknown key whatsoever");
-                 PyErr_PrintEx(n);
-                 return Py_None;
-             }
-             """,
-            resultspec="O",
-            argspec='i',
-            arguments=["int n"],
-            callfunction="wrap_PyErr_PrintEx",
-            cmpfunc=unhandled_error_compare
-        )
+    test_PyErr_PrintEx = CPyExtFunction(
+        lambda args: None,
+        lambda: (
+            (True,),
+        ),
+        code="""PyObject* wrap_PyErr_PrintEx(int n) {
+             PyErr_SetString(PyExc_KeyError, "unknown key whatsoever");
+             PyErr_PrintEx(n);
+             return Py_None;
+         }
+         """,
+        resultspec="O",
+        argspec='i',
+        arguments=["int n"],
+        callfunction="wrap_PyErr_PrintEx",
+        cmpfunc=unhandled_error_compare
+    )
 
     test_PyErr_GivenExceptionMatches = CPyExtFunction(
         _reference_givenexceptionmatches,
@@ -267,17 +266,16 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
-    if not getattr(sys, "graal_python_opaque_filesystem", False):
-        test_PyErr_WarnEx = CPyExtFunctionVoid(
-            lambda args: warnings.warn(args[1], args[0], args[2]),
-            lambda: (
-                (UserWarning, "custom warning", 1),
-            ),
-            resultspec="O",
-            argspec='Osn',
-            arguments=["PyObject* category", "char* msg", "Py_ssize_t level"],
-            cmpfunc=unhandled_error_compare
-        )
+    test_PyErr_WarnEx = CPyExtFunctionVoid(
+        lambda args: warnings.warn(args[1], args[0], args[2]),
+        lambda: (
+            (UserWarning, "custom warning", 1),
+        ),
+        resultspec="O",
+        argspec='Osn',
+        arguments=["PyObject* category", "char* msg", "Py_ssize_t level"],
+        cmpfunc=unhandled_error_compare
+    )
 
     test_PyErr_NoMemory = CPyExtFunctionVoid(
         _reference_nomemory,

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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
@@ -176,11 +176,3 @@ def test_builtin_open():
         unlink(file_name)
 
     assert success
-
-
-import sys
-if getattr(sys, "graal_python_opaque_filesystem", False):
-    # this cannot possibly work with opaque files
-    for k in globals():
-        if k.startswith("test_"):
-            del globals()[k]

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

@@ -90,7 +90,6 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
-import com.oracle.graal.python.builtins.objects.bytes.OpaqueBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
@@ -774,12 +773,6 @@ PCode compile(PBytes source, String filename, String mode, Object kwFlags, Objec
             return compile(new String(toBytesNode.execute(source)), filename, mode, kwFlags, kwDontInherit, kwOptimize);
         }
 
-        @Specialization
-        @TruffleBoundary
-        PCode compile(OpaqueBytes source, String filename, String mode, Object kwFlags, Object kwDontInherit, Object kwOptimize) {
-            return compile(new String(source.getBytes()), filename, mode, kwFlags, kwDontInherit, kwOptimize);
-        }
-
         @SuppressWarnings("unused")
         @Specialization
         @TruffleBoundary

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

@@ -101,7 +101,6 @@
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltinsFactory.StatNodeFactory;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.bytes.BytesNodes.ToBytesNode;
-import com.oracle.graal.python.builtins.objects.bytes.OpaqueBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
@@ -1118,19 +1117,7 @@ public abstract static class ReadNode extends PythonFileNode {
 
         @CompilationFinal private BranchProfile tooLargeProfile = BranchProfile.create();
 
-        @Specialization(guards = "readOpaque(frame)")
-        Object readOpaque(@SuppressWarnings("unused") VirtualFrame frame, int fd, long requestedSize,
-                        @Cached("createClassProfile()") ValueProfile channelClassProfile,
-                        @Cached("create()") ReadFromChannelNode readNode) {
-            if (OpaqueBytes.isInOpaqueFilesystem(getResources().getFilePath(fd), getContext())) {
-                Channel channel = getResources().getFileChannel(fd, channelClassProfile);
-                ByteSequenceStorage bytes = readNode.execute(channel, ReadFromChannelNode.MAX_READ);
-                return new OpaqueBytes(Arrays.copyOf(bytes.getInternalByteArray(), bytes.length()));
-            }
-            return read(frame, fd, requestedSize, channelClassProfile, readNode);
-        }
-
-        @Specialization(guards = "!readOpaque(frame)")
+        @Specialization
         Object read(@SuppressWarnings("unused") VirtualFrame frame, int fd, long requestedSize,
                         @Cached("createClassProfile()") ValueProfile channelClassProfile,
                         @Cached("create()") ReadFromChannelNode readNode) {
@@ -1145,13 +1132,6 @@ Object read(@SuppressWarnings("unused") VirtualFrame frame, int fd, long request
             ByteSequenceStorage array = readNode.execute(channel, size);
             return factory().createBytes(array);
         }
-
-        /**
-         * @param frame - only used so the DSL sees this as a dynamic check
-         */
-        protected boolean readOpaque(VirtualFrame frame) {
-            return OpaqueBytes.isEnabled(getContext());
-        }
     }
 
     @Builtin(name = "isatty", minNumOfPositionalArgs = 1)

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

@@ -180,8 +180,6 @@ public void postInitialize(PythonCore core) {
         sys.setAttribute("graal_python_home", context.getLanguage().getHome());
         sys.setAttribute("graal_python_core_home", PythonOptions.getOption(context, PythonOptions.CoreHome));
         sys.setAttribute("graal_python_stdlib_home", PythonOptions.getOption(context, PythonOptions.StdLibHome));
-        sys.setAttribute("graal_python_opaque_filesystem", PythonOptions.getOption(context, PythonOptions.OpaqueFilesystem));
-        sys.setAttribute("graal_python_opaque_filesystem_prefix", PythonOptions.getOption(context, PythonOptions.OpaqueFilesystemPrefixes));
         sys.setAttribute("__flags__", core.factory().createTuple(new Object[]{
                         false, // bytes_warning
                         !PythonOptions.getFlag(context, PythonOptions.PythonOptimizeFlag), // debug

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java

@@ -58,7 +58,6 @@
 import com.oracle.graal.python.builtins.objects.common.IndexNodes.NormalizeIndexNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.iterator.PSequenceIterator;
-import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -325,33 +324,7 @@ public Object repr(PBytes self,
     @Builtin(name = "join", minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class JoinNode extends PythonBinaryBuiltinNode {
-        /**
-         * @param bytes - the parameter is used to force the DSL to make this a dynamic check
-         */
-        protected boolean readOpaque(PBytes bytes) {
-            return OpaqueBytes.isEnabled(getContext());
-        }
-
-        @Specialization(guards = {"readOpaque(bytes)"})
-        public Object join(PBytes bytes, PList iterable,
-                        @Cached("create()") SequenceStorageNodes.GetItemNode getItemNode,
-                        @Cached("create()") SequenceStorageNodes.LenNode lenNode,
-                        @Cached("create()") SequenceStorageNodes.ToByteArrayNode toByteArrayNode,
-                        @Cached("create()") BytesNodes.BytesJoinNode bytesJoinNode) {
-            int len = lenNode.execute(iterable.getSequenceStorage());
-            if (len == 1) {
-                // branch profiles aren't really needed, because of the specialization
-                // happening in the getItemNode on first execution and the assumption
-                // in OpaqueBytes.isInstance
-                Object firstItem = getItemNode.execute(iterable.getSequenceStorage(), 0);
-                if (OpaqueBytes.isInstance(firstItem)) {
-                    return firstItem;
-                }
-            }
-            return join(bytes, iterable, toByteArrayNode, bytesJoinNode);
-        }
-
-        @Specialization(guards = {"!readOpaque(bytes)"})
+        @Specialization
         public PBytes join(PBytes bytes, Object iterable,
                         @Cached("create()") SequenceStorageNodes.ToByteArrayNode toByteArrayNode,
                         @Cached("create()") BytesNodes.BytesJoinNode bytesJoinNode) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/OpaqueBytes.java

@@ -41,7 +41,6 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
-import com.oracle.graal.python.builtins.objects.bytes.OpaqueBytes;
 import com.oracle.graal.python.builtins.objects.cext.PThreadState;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
@@ -257,8 +256,6 @@ private void setupRuntimeInformation() {
 
         sysModules.setItem(__MAIN__, mainModule);
 
-        OpaqueBytes.initializeForNewContext(this);
-
         currentException = null;
         isInitialized = true;
     }