From 9d7590a44ab7be84a3c17606785e1e7f31524544 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Thu, 7 Apr 2016 12:58:34 -0400 Subject: [PATCH] [runtime] Mark mono_object_new_from_token external only. Does not appear to be used in the runtime. Changed it not to raise exceptions. --- mono/metadata/object.c | 4 ++-- mono/metadata/object.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mono/metadata/object.c b/mono/metadata/object.c index 626c30a3db3..86f78c5e6b0 100644 --- a/mono/metadata/object.c +++ b/mono/metadata/object.c @@ -5180,11 +5180,11 @@ mono_object_new_from_token (MonoDomain *domain, MonoImage *image, guint32 token MonoClass *klass; klass = mono_class_get_checked (image, token, &error); - g_assert (mono_error_ok (&error)); /* FIXME don't swallow the error */ + mono_error_assert_ok (&error); result = mono_object_new_checked (domain, klass, &error); - mono_error_raise_exception (&error); /* FIXME don't raise here */ + mono_error_cleanup (&error); /* FIXME don't raise here */ return result; } diff --git a/mono/metadata/object.h b/mono/metadata/object.h index e7c0f990291..bdc5c9aa9bb 100644 --- a/mono/metadata/object.h +++ b/mono/metadata/object.h @@ -82,6 +82,7 @@ mono_object_new_fast (MonoVTable *vtable); MONO_API MonoObject * mono_object_new_alloc_specific (MonoVTable *vtable); +MONO_RT_EXTERNAL_ONLY MONO_API MonoObject * mono_object_new_from_token (MonoDomain *domain, MonoImage *image, uint32_t token); -- 2.25.1