Fix C extensions list

Author: msimacek

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

@@ -315,20 +315,20 @@ Object run(VirtualFrame frame, PythonObject moduleSpec, @SuppressWarnings("unuse
 
         @TruffleBoundary
         private Object run(PythonContext context, ModuleSpec spec) throws IOException, ApiInitException, ImportException {
-            Object existingModule = findExtension(context, spec);
+            PythonModule existingModule = findExtension(context, spec);
             if (existingModule != null) {
                 return existingModule;
             }
             return CExtContext.loadCExtModule(this, context, spec, getCheckResultNode());
         }
 
-        private Object findExtension(PythonContext context, ModuleSpec spec) {
-            // TODO check m_size
-            // TODO populate m_copy
+        private PythonModule findExtension(PythonContext context, ModuleSpec spec) {
             CApiContext cApiContext = context.getCApiContext();
             if (cApiContext == null) {
                 return null;
             }
+            // TODO check m_size
+            // TODO populate m_copy?
             return cApiContext.findExtension(spec.path, spec.name);
         }
 

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

@@ -180,7 +180,7 @@ public final class CApiContext extends CExtContext {
     private Object nativeSmallIntsArray;
 
     /** Same as {@code import.c: extensions} but we don't keep a PDict; just a bare Java HashMap. */
-    private final HashMap<Pair<TruffleString, TruffleString>, Object> extensions = new HashMap<>(4);
+    private final HashMap<Pair<TruffleString, TruffleString>, PythonModule> extensions = new HashMap<>(4);
 
     /** corresponds to {@code unicodeobject.c: interned} */
     private PDict internedUnicode;
@@ -812,13 +812,13 @@ public Object initCApiModule(Node location, Object sharedLibrary, TruffleString
             modulesByIndex.set(mIndex, module);
 
             // add to 'import.c: extensions'
-            extensions.put(Pair.create(spec.path, spec.name), module.getNativeModuleDef());
+            extensions.put(Pair.create(spec.path, spec.name), module);
             return result;
         }
     }
 
     @TruffleBoundary
-    public Object findExtension(TruffleString filename, TruffleString name) {
+    public PythonModule findExtension(TruffleString filename, TruffleString name) {
         return extensions.get(Pair.create(filename, name));
     }