Add missing boundary to codecs registry initialization

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/codecs/CodecsRegistry.java

@@ -131,19 +131,24 @@ static void registerNoCallable(@SuppressWarnings("unused") Node inliningTarget,
 
     public static void ensureRegistryInitialized(PythonContext context) {
         if (CompilerDirectives.injectBranchProbability(CompilerDirectives.SLOWPATH_PROBABILITY, !context.isCodecsInitialized())) {
-            registerDefaultHandler(context, T_STRICT, StrictErrorHandlerNodeFactory.getInstance());
-            registerDefaultHandler(context, T_IGNORE, IgnoreErrorHandlerNodeFactory.getInstance());
-            registerDefaultHandler(context, T_REPLACE, ReplaceErrorHandlerNodeFactory.getInstance());
-            registerDefaultHandler(context, T_XMLCHARREFREPLACE, XmlCharRefReplaceErrorHandlerNodeFactory.getInstance());
-            registerDefaultHandler(context, T_BACKSLASHREPLACE, BackslashReplaceErrorHandlerNodeFactory.getInstance());
-            registerDefaultHandler(context, T_NAMEREPLACE, NameReplaceErrorHandlerNodeFactory.getInstance());
-            registerDefaultHandler(context, T_SURROGATEPASS, SurrogatePassErrorHandlerNodeFactory.getInstance());
-            registerDefaultHandler(context, T_SURROGATEESCAPE, SurrogateEscapeErrorHandlerNodeFactory.getInstance());
-            AbstractImportNode.importModule(T_ENCODINGS);
-            context.markCodecsInitialized();
+            doInitialize(context);
         }
     }
 
+    @TruffleBoundary
+    private static void doInitialize(PythonContext context) {
+        registerDefaultHandler(context, T_STRICT, StrictErrorHandlerNodeFactory.getInstance());
+        registerDefaultHandler(context, T_IGNORE, IgnoreErrorHandlerNodeFactory.getInstance());
+        registerDefaultHandler(context, T_REPLACE, ReplaceErrorHandlerNodeFactory.getInstance());
+        registerDefaultHandler(context, T_XMLCHARREFREPLACE, XmlCharRefReplaceErrorHandlerNodeFactory.getInstance());
+        registerDefaultHandler(context, T_BACKSLASHREPLACE, BackslashReplaceErrorHandlerNodeFactory.getInstance());
+        registerDefaultHandler(context, T_NAMEREPLACE, NameReplaceErrorHandlerNodeFactory.getInstance());
+        registerDefaultHandler(context, T_SURROGATEPASS, SurrogatePassErrorHandlerNodeFactory.getInstance());
+        registerDefaultHandler(context, T_SURROGATEESCAPE, SurrogateEscapeErrorHandlerNodeFactory.getInstance());
+        AbstractImportNode.importModule(T_ENCODINGS);
+        context.markCodecsInitialized();
+    }
+
     @TruffleBoundary
     private static void registerDefaultHandler(PythonContext context, TruffleString name, NodeFactory<? extends PythonBuiltinBaseNode> nodeFactory) {
         PBuiltinFunction f = PythonUtils.createMethod(context.getLanguage(), null, nodeFactory, null, 0);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java

@@ -82,6 +82,7 @@
 import com.oracle.graal.python.runtime.object.PFactory;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.CompilerDirectives.ValueType;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -103,6 +104,7 @@ public abstract class AbstractImportNode extends PNodeWithContext {
     /**
      * Equivalent of {@code PyImport_Import} and {@code PyImport_ImportModule}.
      */
+    @TruffleBoundary
     public static PythonModule importModule(TruffleString name) {
         /*
          * TODO we should rather use {@link com.oracle.graal.python.lib.PyImportImport}, but it