[GR-16441] Add missing TruffleBoundary in PZipImporter.

PullRequest: graalpython/559

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/PZipImporter.java

@@ -125,8 +125,8 @@ public PZipImporter(LazyPythonClass cls, PDict zipDirectoryCache, String separat
     private SearchOrderEntry[] defineSearchOrder() {
         return new SearchOrderEntry[]{
                         new SearchOrderEntry(joinStrings(separator, "__init__.py"),
-                                        EnumSet.of(EntryType.IS_PACKAGE, EntryType.IS_SOURCE)),
-                        new SearchOrderEntry(".py", EnumSet.of(EntryType.IS_SOURCE))
+                                        enumSetOf(EntryType.IS_PACKAGE, EntryType.IS_SOURCE)),
+                        new SearchOrderEntry(".py", enumSetOf(EntryType.IS_SOURCE))
         };
     }
 
@@ -135,6 +135,16 @@ private static String joinStrings(String a, String b) {
         return a + b;
     }
 
+    @TruffleBoundary
+    private static <E extends Enum<E>> EnumSet<E> enumSetOf(E e1) {
+        return EnumSet.of(e1);
+    }
+
+    @TruffleBoundary
+    private static <E extends Enum<E>> EnumSet<E> enumSetOf(E e1, E e2) {
+        return EnumSet.of(e1, e2);
+    }
+
     public PDict getZipDirectoryCache() {
         return moduleZipDirectoryCache;
     }

mx.graalpython/mx_graalpython.py

@@ -359,7 +359,7 @@ def graalpython_gate_runner(args, tasks):
 
     with Task('GraalPython sandboxed tests', tasks, tags=[GraalPythonTags.unittest_sandboxed]) as task:
         if task:
-            run_python_unittests(python_gvm(["sandboxed"]), args=["--llvm.sandboxed"])
+            run_python_unittests(python_gvm(["sandboxed"]), args=["--llvm.managed"])
 
     with Task('GraalPython Python tests', tasks, tags=[GraalPythonTags.tagged]) as task:
         if task:
@@ -373,7 +373,7 @@ def graalpython_gate_runner(args, tasks):
 
     with Task('GraalPython sandboxed tests on SVM', tasks, tags=[GraalPythonTags.svmunit_sandboxed]) as task:
         if task:
-            run_python_unittests(python_svm(["sandboxed"]), args=["--llvm.sandboxed"])
+            run_python_unittests(python_svm(["sandboxed"]), args=["--llvm.managed"])
 
     with Task('GraalPython license header update', tasks, tags=[GraalPythonTags.license]) as task:
         if task:
@@ -522,7 +522,7 @@ def run_shared_lib_test(args=None):
                 return status;
             }
         #if %s
-            status = poly_context_builder_option(isolate_thread, builder, "llvm.sandboxed", "true");
+            status = poly_context_builder_option(isolate_thread, builder, "llvm.managed", "true");
             if (status != poly_ok) {
                 return status;
             }
@@ -998,10 +998,10 @@ def _register_vms(namespace):
         '-Dgraal.TruffleExperimentalSplittingAllowForcedSplits=false'
     ]), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_SANDBOXED, extra_polyglot_args=[
-        '--llvm.sandboxed',
+        '--llvm.managed',
     ]), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_NATIVE, extra_polyglot_args=[
-        "--llvm.sandboxed=false"
+        "--llvm.managed=false"
     ]), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_DUMP, extra_polyglot_args=[
         "--experimental-options", "-dump"