Skip to content

[monodroid] typemaps may need to load assemblies #8625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 11 commits into from
Feb 2, 2024
Merged

[monodroid] typemaps may need to load assemblies #8625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4332ea0
Bump external/Java.Interop from `8b85462` to `def5bc0`
dependabot[bot] Jan 11, 2024
74bd7c4
Merge branch 'main' into dependabot/submodules/external/Java.Interop-…
jonathanpeppers Jan 23, 2024
e192af6
JavaTypeScanner processes all IJavaPeerable implementors
jonathanpeppers Jan 23, 2024
8fcc2ad
Try xamarin/java.interop#1181
jonpryor Jan 24, 2024
9a7aee7
Attempt to fix assembly image load for typemap
grendello Jan 25, 2024
7b46391
Take 2 to fix assembly load for typemap lookup
grendello Jan 25, 2024
b4ca587
Audit JNIEnv::GetObjectClass() invocations
jonpryor Jan 26, 2024
cde4e71
Take 3 to fix assembly load for typemap lookup
grendello Jan 29, 2024
a82c8f8
Merge remote-tracking branch 'origin/main' into dependabot/submodules…
jonpryor Feb 2, 2024
d500a19
Back to java.interop/main…
jonpryor Feb 2, 2024
a9dd3c5
Cleanup.
jonpryor Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/Mono.Android/Java.Interop/TypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ internal static IJavaPeerable CreateInstance (IntPtr handle, JniHandleOwnership
{
Type? type = null;
IntPtr class_ptr = JNIEnv.GetObjectClass (handle);
string class_name = GetClassName (class_ptr);
string? class_name = GetClassName (class_ptr);
lock (TypeManagerMapDictionaries.AccessLock) {
while (class_ptr != IntPtr.Zero && !TypeManagerMapDictionaries.JniToManaged.TryGetValue (class_name, out type)) {

Expand All @@ -279,12 +279,18 @@ internal static IJavaPeerable CreateInstance (IntPtr handle, JniHandleOwnership

IntPtr super_class_ptr = JNIEnv.GetSuperclass (class_ptr);
JNIEnv.DeleteLocalRef (class_ptr);
class_name = null;
class_ptr = super_class_ptr;
class_name = GetClassName (class_ptr);
if (class_ptr != IntPtr.Zero) {
class_name = GetClassName (class_ptr);
}
}
}

JNIEnv.DeleteLocalRef (class_ptr);
if (class_ptr != IntPtr.Zero) {
JNIEnv.DeleteLocalRef (class_ptr);
class_ptr = IntPtr.Zero;
}

if (targetType != null &&
(type == null ||
Expand Down
24 changes: 24 additions & 0 deletions src/monodroid/jni/embedded-assemblies.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,30 @@ EmbeddedAssemblies::typemap_java_to_managed (hash_t hash, const MonoString *java

if (module->image == nullptr) {
module->image = mono_image_loaded (module->assembly_name);

if (module->image == nullptr) {
log_debug (LOG_ASSEMBLY, "typemap: assembly '%s' hasn't been loaded yet, attempting a full load", module->assembly_name);

// Fake a request from MonoVM to load the assembly.
MonoAssemblyName *assembly_name = mono_assembly_name_new (module->assembly_name);
MonoAssembly *assm;

if (assembly_name == nullptr) {
log_error (LOG_ASSEMBLY, "typemap: failed to create Mono assembly name for '%s'", module->assembly_name);
assm = nullptr;
} else {
MonoAssemblyLoadContextGCHandle alc_gchandle = mono_alc_get_default_gchandle ();
MonoError mono_error;
assm = embeddedAssemblies.open_from_bundles (assembly_name, alc_gchandle, &mono_error, false /* ref_only */);
}

if (assm == nullptr) {
log_warn (LOG_ASSEMBLY, "typemap: failed to load managed assembly '%s'", module->assembly_name);
} else {
module->image = mono_assembly_get_image (assm);
}
}

if (module->image == nullptr) {
log_error (LOG_ASSEMBLY, "typemap: unable to load assembly '%s' when looking up managed type corresponding to Java type '%s'", module->assembly_name, to_utf8 (java_type_name).get ());
return nullptr;
Expand Down
9 changes: 3 additions & 6 deletions src/monodroid/jni/osbridge.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,15 +657,13 @@ OSBridge::add_reference_jobject (JNIEnv *env, jobject handle, jobject reffed_han

java_class = env->GetObjectClass (handle);
add_method_id = env->GetMethodID (java_class, "monodroidAddReference", "(Ljava/lang/Object;)V");
env->DeleteLocalRef (java_class);
if (add_method_id) {
env->CallVoidMethod (handle, add_method_id, reffed_handle);
env->DeleteLocalRef (java_class);

return 1;
}

env->ExceptionClear ();
env->DeleteLocalRef (java_class);
return 0;
}

Expand Down Expand Up @@ -910,7 +908,6 @@ OSBridge::gc_cleanup_after_java_collection (JNIEnv *env, int num_sccs, MonoGCBri
MonoClass *klass;
#endif
MonoObject *obj;
jclass java_class;
jobject jref;
jmethodID clear_method_id;
int i, j, total, alive, refs_added;
Expand Down Expand Up @@ -942,8 +939,9 @@ OSBridge::gc_cleanup_after_java_collection (JNIEnv *env, int num_sccs, MonoGCBri
sccs [i]->is_alive = 1;
mono_field_get_value (obj, bridge_info->refs_added, &refs_added);
if (refs_added) {
java_class = env->GetObjectClass (jref);
jclass java_class = env->GetObjectClass (jref);
clear_method_id = env->GetMethodID (java_class, "monodroidClearReferences", "()V");
env->DeleteLocalRef (java_class);
if (clear_method_id) {
env->CallVoidMethod (jref, clear_method_id);
} else {
Expand All @@ -957,7 +955,6 @@ OSBridge::gc_cleanup_after_java_collection (JNIEnv *env, int num_sccs, MonoGCBri
}
#endif
}
env->DeleteLocalRef (java_class);
}
} else {
abort_unless (!sccs [i]->is_alive, "Bridge SCC at index %d must NOT be alive", i);
Expand Down