Allow disabling frozen modules

Author: msimacek

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

@@ -41,7 +41,6 @@
 package com.oracle.graal.python.builtins.modules;
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
-import static com.oracle.graal.python.builtins.modules.ImpModuleBuiltins.FrozenStatus.FROZEN_BAD_NAME;
 import static com.oracle.graal.python.builtins.modules.ImpModuleBuiltins.FrozenStatus.FROZEN_DISABLED;
 import static com.oracle.graal.python.builtins.modules.ImpModuleBuiltins.FrozenStatus.FROZEN_EXCLUDED;
 import static com.oracle.graal.python.builtins.modules.ImpModuleBuiltins.FrozenStatus.FROZEN_INVALID;
@@ -54,11 +53,6 @@
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 
-import com.oracle.graal.python.builtins.objects.code.CodeNodes;
-import com.oracle.graal.python.builtins.objects.function.PArguments;
-import com.oracle.graal.python.nodes.call.GenericInvokeNode;
-import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.graalvm.nativeimage.ImageInfo;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -86,22 +80,25 @@
 import com.oracle.graal.python.builtins.objects.cext.common.LoadCExtException.ImportException;
 import com.oracle.graal.python.builtins.objects.cext.hpy.HPyExternalFunctionNodes.HPyCheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.hpy.HPyExternalFunctionNodesFactory.HPyCheckHandleResultNodeGen;
+import com.oracle.graal.python.builtins.objects.code.CodeNodes;
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
+import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.ints.IntBuiltins;
 import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
+import com.oracle.graal.python.builtins.objects.module.FrozenModules;
+import com.oracle.graal.python.builtins.objects.module.PythonFrozenModule;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.str.PString;
-import com.oracle.graal.python.builtins.objects.module.PythonFrozenModule;
-import com.oracle.graal.python.builtins.objects.module.FrozenModules;
 import com.oracle.graal.python.lib.PyObjectLookupAttr;
 import com.oracle.graal.python.lib.PyObjectStrAsJavaStringNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
 import com.oracle.graal.python.nodes.attributes.SetAttributeNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
+import com.oracle.graal.python.nodes.call.GenericInvokeNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
@@ -116,13 +113,15 @@
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(defineModule = "_imp", isEager = true)
 public class ImpModuleBuiltins extends PythonBuiltins {
@@ -470,7 +469,7 @@ boolean run(String name) {
             if (!getContext().getOption(PythonOptions.PythonPath).isEmpty() && "site".equals(name)) {
                 return false;
             } else {
-                return findFrozen(name).status == FROZEN_OKAY;
+                return findFrozen(getContext(), name).status == FROZEN_OKAY;
             }
         }
     }
@@ -489,9 +488,9 @@ protected ArgumentClinicProvider getArgumentClinic() {
         }
 
         @Specialization
-        static boolean run(String name,
+        boolean run(String name,
                         @Cached PRaiseNode raiseNode) {
-            FrozenResult result = findFrozen(name);
+            FrozenResult result = findFrozen(getContext(), name);
             if (result.status != FROZEN_EXCLUDED) {
                 raiseFrozenError(result.status, name, raiseNode);
             }
@@ -530,7 +529,7 @@ Object run(VirtualFrame frame, String name, Object dataObj,
                     raiseFrozenError(FROZEN_INVALID, name, raiseNode);
                 }
             } else {
-                FrozenResult result = findFrozen(name);
+                FrozenResult result = findFrozen(getContext(), name);
                 FrozenStatus status = result.status;
                 info = result.info;
                 raiseFrozenError(status, name, raiseNode);
@@ -579,7 +578,7 @@ protected ArgumentClinicProvider getArgumentClinic() {
         Object run(VirtualFrame frame, String name, boolean withData,
                         @Cached MemoryViewNode memoryViewNode,
                         @Cached PRaiseNode raiseNode) {
-            FrozenResult result = findFrozen(name);
+            FrozenResult result = findFrozen(getContext(), name);
             FrozenStatus status = result.status;
             FrozenInfo info = result.info;
 
@@ -643,7 +642,7 @@ public static PythonModule importFrozenModuleObject(Python3Core core, String nam
      */
     @TruffleBoundary
     public static PythonModule importFrozenModuleObject(Python3Core core, String name, boolean doRaise, PythonModule globals) {
-        FrozenResult result = findFrozen(name);
+        FrozenResult result = findFrozen(core.getContext(), name);
         FrozenStatus status = result.status;
         FrozenInfo info = result.info;
 
@@ -680,10 +679,13 @@ public static PythonModule importFrozenModuleObject(Python3Core core, String nam
 
     /*
      * CPython's version of this accepts any object and casts, but all Python-level callers use
-     * argument clinic to convert the name first. The only exeption is
+     * argument clinic to convert the name first. The only exception is
      * PyImport_ImportFrozenModuleObject, which we don't expose as C API and handle differently_
      */
-    private static FrozenResult findFrozen(String name) {
+    private static FrozenResult findFrozen(PythonContext context, String name) {
+        if (context.getOption(PythonOptions.DisableFrozenModules)) {
+            return new FrozenResult(FROZEN_DISABLED);
+        }
         PythonFrozenModule module = FrozenModules.lookup(name);
 
         if (module == null) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -291,6 +291,9 @@ private PythonOptions() {
     @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Enable built-in functions on the __graalpython__ module that are useful for debugging.") //
     public static final OptionKey<Boolean> EnableDebuggingBuiltins = new OptionKey<>(false);
 
+    @Option(category = OptionCategory.EXPERT, help = "Disables using frozen modules.") //
+    public static final OptionKey<Boolean> DisableFrozenModules = new OptionKey<>(false);
+
     public static final OptionDescriptors DESCRIPTORS = new PythonOptionsOptionDescriptors();
 
     @CompilationFinal(dimensions = 1) private static final OptionKey<?>[] ENGINE_OPTION_KEYS;