Resolve handle in CreateDynamic

Author: fangerer

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

@@ -61,6 +61,7 @@
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.AsPythonObjectNodeGen;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.ResolveHandleNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.CheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContext;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyInitObject;
@@ -76,6 +77,7 @@
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.SetAttributeNode;
@@ -344,7 +346,7 @@ private Object initHPyModule(TruffleObject sulongLibrary, String initFuncName, S
             if (!(result instanceof PythonModule)) {
                 // PyModuleDef_Init(pyModuleDef)
                 // TODO: PyModule_FromDefAndSpec((PyModuleDef*)m, spec);
-                throw raise(NotImplementedError, "multi-phase init of extension module %s", name);
+                throw PRaiseNode.raiseUncached(this, NotImplementedError, ErrorMessages.MULTI_PHASE_INIT_OF_EXTENSION_MODULE_S, name);
             } else {
                 ((PythonObject) result).setAttribute(__FILE__, path);
                 // TODO: _PyImport_FixupExtensionObject(result, name, path, sys.modules)
@@ -377,11 +379,11 @@ private Object initCApiModule(TruffleObject sulongLibrary, String initFuncName,
 
             getCheckResultNode().execute(context, initFuncName, nativeResult);
 
-            Object result = AsPythonObjectNodeGen.getUncached().execute(nativeResult);
+            Object result = AsPythonObjectNodeGen.getUncached().execute(ResolveHandleNodeGen.getUncached().execute(nativeResult));
             if (!(result instanceof PythonModule)) {
                 // PyModuleDef_Init(pyModuleDef)
                 // TODO: PyModule_FromDefAndSpec((PyModuleDef*)m, spec);
-                throw raise(NotImplementedError, "multi-phase init of extension module %s", path);
+                throw PRaiseNode.raiseUncached(this, NotImplementedError, ErrorMessages.MULTI_PHASE_INIT_OF_EXTENSION_MODULE_S, path);
             } else {
                 ((PythonObject) result).setAttribute(__FILE__, path);
                 // TODO: _PyImport_FixupExtensionObject(result, name, path, sys.modules)

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

@@ -748,4 +748,5 @@ public abstract class ErrorMessages {
     public static final String P_RETURNED_NON_P = "%p.%s returned non-%s (type %p). " +
                     "The ability to return an instance of a strict subclass of %s " +
                     "is deprecated, and may be removed in a future version of Python.";
+    public static final String MULTI_PHASE_INIT_OF_EXTENSION_MODULE_S = "multi-phase init of extension module %s";
 }