[runtime] Remove MonoLookupDynamicToken indirection

Call mono_reflection_lookup_dynamic_token directly from
mono_lookup_dynamic_token.

Delete mono_install_lookup_dynamic_token () and the
MonoLookupDynamicToken typedef.

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index d525ca0c47e971326dff7656848e39bfa406ed48..e7a0db8eb2afaa66d4a204087fd839d4f7f49421 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -257,7 +257,6 @@ mono_runtime_init_checked (MonoDomain *domain, MonoThreadStartCB start_cb, MonoT
        mono_install_assembly_postload_search_hook ((MonoAssemblySearchFunc)mono_domain_assembly_postload_search, GUINT_TO_POINTER (FALSE));
        mono_install_assembly_postload_refonly_search_hook ((MonoAssemblySearchFunc)mono_domain_assembly_postload_search, GUINT_TO_POINTER (TRUE));
        mono_install_assembly_load_hook (mono_domain_fire_assembly_load, NULL);
-       mono_install_lookup_dynamic_token (mono_reflection_lookup_dynamic_token);
 
        mono_thread_init (start_cb, attach_cb);
 

diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h
index 772b22f93f410d3294e87dddfcd3022189e8b514..b68f5006590b321aeb13729a2b9109f92d6d57d2 100644 (file)
--- a/mono/metadata/class-internals.h
+++ b/mono/metadata/class-internals.h
@@ -918,8 +918,6 @@ extern MonoStats mono_stats;
 typedef gpointer (*MonoRemotingTrampoline)       (MonoDomain *domain, MonoMethod *method, MonoRemotingTarget target);
 typedef gpointer (*MonoDelegateTrampoline)       (MonoDomain *domain, MonoClass *klass);
 
-typedef gpointer (*MonoLookupDynamicToken) (MonoImage *image, guint32 token, gboolean valid_token, MonoClass **handle_class, MonoGenericContext *context, MonoError *error);
-
 typedef gboolean (*MonoGetCachedClassInfo) (MonoClass *klass, MonoCachedClassInfo *res);
 
 typedef gboolean (*MonoGetClassFromName) (MonoImage *image, const char *name_space, const char *name, MonoClass **res);
@@ -1016,9 +1014,6 @@ mono_lookup_dynamic_token (MonoImage *image, guint32 token, MonoGenericContext *
 gpointer
 mono_lookup_dynamic_token_class (MonoImage *image, guint32 token, gboolean check_token, MonoClass **handle_class, MonoGenericContext *context);
 
-void
-mono_install_lookup_dynamic_token (MonoLookupDynamicToken func);
-
 gpointer
 mono_runtime_create_jump_trampoline (MonoDomain *domain, MonoMethod *method, gboolean add_sync_wrapper);
 

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 6e333d4ea9569744501cdeb411215b910c53419d..d7859fa7fa391cfe33db472b0b24015aa6c9c421 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -8864,25 +8864,13 @@ mono_ldtoken_checked (MonoImage *image, guint32 token, MonoClass **handle_class,
        return NULL;
 }
 
-/**
- * This function might need to call runtime functions so it can't be part
- * of the metadata library.
- */
-static MonoLookupDynamicToken lookup_dynamic = NULL;
-
-void
-mono_install_lookup_dynamic_token (MonoLookupDynamicToken func)
-{
-       lookup_dynamic = func;
-}
-
 gpointer
 mono_lookup_dynamic_token (MonoImage *image, guint32 token, MonoGenericContext *context)
 {
        MonoError error;
        MonoClass *handle_class;
 
-       gpointer result = lookup_dynamic (image, token, TRUE, &handle_class, context, &error);
+       gpointer result = mono_reflection_lookup_dynamic_token (image, token, TRUE, &handle_class, context, &error);
        mono_error_raise_exception (&error); /* FIXME don't raise here */
        return result;
 
@@ -8892,7 +8880,7 @@ gpointer
 mono_lookup_dynamic_token_class (MonoImage *image, guint32 token, gboolean valid_token, MonoClass **handle_class, MonoGenericContext *context)
 {
        MonoError error;
-       gpointer result = lookup_dynamic (image, token, valid_token, handle_class, context, &error);
+       gpointer result = mono_reflection_lookup_dynamic_token (image, token, valid_token, handle_class, context, &error);
        mono_error_raise_exception (&error); /* FIXME don't raise here */
        return result;