Migrate to createHostAdapter

Author: msimacek

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

@@ -121,7 +121,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleFile;
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.dsl.Cached;
@@ -768,7 +767,8 @@ private void validate(HashingStorage dictStorage) {
     @GenerateNodeFactory
     public abstract static class JavaExtendNode extends PythonUnaryBuiltinNode {
         @Specialization
-        Object doIt(Object value) {
+        Object doIt(Object value,
+                        @CachedLibrary(limit = "3") InteropLibrary lib) {
             if (ImageInfo.inImageBuildtimeCode()) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw new UnsupportedOperationException(ErrorMessages.CANT_EXTEND_JAVA_CLASS_NOT_JVM);
@@ -779,21 +779,19 @@ Object doIt(Object value) {
             }
 
             Env env = getContext().getEnv();
-            if (!isType(value, env)) {
+            if (!isType(value, env, lib)) {
                 throw raise(TypeError, ErrorMessages.CANT_EXTEND_JAVA_CLASS_NOT_TYPE, value);
             }
 
-            final Class<?>[] types = new Class<?>[1];
-            types[0] = (Class<?>) env.asHostObject(value);
             try {
-                return env.createHostAdapterClass(types);
+                return env.createHostAdapter(new Object[]{value});
             } catch (Exception ex) {
                 throw raise(TypeError, ex.getMessage(), ex);
             }
         }
 
-        protected static boolean isType(Object obj, TruffleLanguage.Env env) {
-            return env.isHostObject(obj) && env.asHostObject(obj) instanceof Class<?>;
+        protected static boolean isType(Object obj, Env env, InteropLibrary lib) {
+            return env.isHostObject(obj) && (env.isHostSymbol(obj) || lib.isMetaObject(obj));
         }
 
     }