[GR-38731] Always add built-in _bz2 module.

PullRequest: graalpython/2275

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -712,7 +712,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
             builtins.add(new LsprofModuleBuiltins());
             builtins.add(LsprofModuleBuiltins.newProfilerBuiltins());
         }
-        if (nativeAccessAllowed) {
+        if (nativeAccessAllowed || ImageInfo.inImageBuildtimeCode()) {
             builtins.add(new BZ2CompressorBuiltins());
             builtins.add(new BZ2DecompressorBuiltins());
             builtins.add(new BZ2ModuleBuiltins());
@@ -911,6 +911,20 @@ public final void postInitialize() {
                 }
             }
 
+            /*
+             * Special case for _bz2: If native access is not allowed, we cannot use the built-in
+             * implementation that would call libbz2 via NFI. Therefore, we remove it from the
+             * built-in modules map (and also from sys.modules if already loaded). This will cause a
+             * fallback to another _bz2 implementation (e.g. LLVM or maybe some Java lib). This
+             * needs to be done here and cannot be done in 'initializeBuiltins' because then we
+             * would never include the intrinsified _bz2 module in the native image since native
+             * access is never allowed during native image build time.
+             */
+            if (ImageInfo.inImageCode() && !getContext().isNativeAccessAllowed()) {
+                builtinModules.remove(BuiltinNames.BZ2);
+                sysModules.delItem(BuiltinNames.BZ2);
+            }
+
             globalScopeObject = PythonMapScope.createTopScope(getContext());
             getContext().getSharedFinalizer().registerAsyncAction();
             initialized = true;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/bz2/BZ2ModuleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -48,14 +48,15 @@
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 
-@CoreFunctions(defineModule = "_bz2")
+@CoreFunctions(defineModule = BuiltinNames.BZ2)
 public class BZ2ModuleBuiltins extends PythonBuiltins {
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CPyObjectArrayWrapper.java

@@ -192,14 +192,14 @@ void toNative(
     }
 
     public void free(PythonNativeWrapperLibrary lib, ReleaseNativeWrapperNode releaseNativeWrapperNode) {
-        if (!PythonContext.get(lib).isNativeAccessAllowed()) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw new RuntimeException(ErrorMessages.NATIVE_ACCESS_NOT_ALLOWED);
-        }
         for (int i = 0; i < wrappers.length; i++) {
             releaseNativeWrapperNode.execute(wrappers[i]);
         }
         if (lib.isNative(this)) {
+            if (!PythonContext.get(lib).isNativeAccessAllowed()) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                throw new RuntimeException(ErrorMessages.NATIVE_ACCESS_NOT_ALLOWED);
+            }
             freeBoundary((long) lib.getNativePointer(this));
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/PDict.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -93,6 +93,10 @@ public void setItem(Object key, Object value) {
         storage = HashingStorageLibrary.getUncached().setItem(storage, key, value);
     }
 
+    public void delItem(Object key) {
+        storage = HashingStorageLibrary.getUncached().delItem(storage, key);
+    }
+
     public static HashingStorage createNewStorage(boolean isStringKey, int expectedSize) {
         HashingStorage newDictStorage;
         if (expectedSize == 0) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/BuiltinNames.java

@@ -79,7 +79,7 @@ public abstract class BuiltinNames {
     public static final String EXIT = "exit";
     public static final String MODULES = "modules";
 
-    // builtin functions
+    // built-in functions
     public static final String ABS = "abs";
     public static final String DICT = "dict";
     public static final String DEFAULTDICT = "defaultdict";
@@ -162,17 +162,11 @@ public abstract class BuiltinNames {
     public static final String HASH = "hash";
     public static final String MEMORYVIEW = "memoryview";
     public static final String SET = "set";
-    public static final String BUILTINS = "builtins";
-    public static final String __GRAALPYTHON__ = "__graalpython__";
-    public static final String _CODECS = "_codecs";
-    public static final String _STRING = "_string";
-    public static final String _CODECS_TRUFFLE = "_codecs_truffle";
     public static final String GETSET_DESCRIPTOR = "getset_descriptor";
     public static final String MEMBER_DESCRIPTOR = "member_descriptor";
     public static final String WRAPPER_DESCRIPTOR = "wrapper_descriptor";
     public static final String SIMPLE_QUEUE = "SimpleQueue";
     public static final String EMPTY = "Empty";
-    public static final String CONTEXTVARS = "_contextvars";
 
     public static final String DICT_KEYITERATOR = "dict_keyiterator";
     public static final String DICT_VALUEITERATOR = "dict_valueiterator";
@@ -183,4 +177,13 @@ public abstract class BuiltinNames {
     public static final String DICT_KEYS = "dict_keys";
     public static final String DICT_ITEMS = "dict_items";
     public static final String DICT_VALUES = "dict_values";
+
+    // built-in modules
+    public static final String BUILTINS = "builtins";
+    public static final String __GRAALPYTHON__ = "__graalpython__";
+    public static final String _CODECS = "_codecs";
+    public static final String _CODECS_TRUFFLE = "_codecs_truffle";
+    public static final String _STRING = "_string";
+    public static final String CONTEXTVARS = "_contextvars";
+    public static final String BZ2 = "_bz2";
 }