Should work now

Author: grendello

src/native/monodroid/monodroid-glue-internal.hh

@@ -239,11 +239,16 @@ namespace xamarin::android::internal
 		}
 
 		static void* monodroid_dlopen_ignore_component_or_load (hash_t hash, const char *name, int flags, char **err) noexcept;
-		static void* monodroid_dlopen (const char *name, int flags, char **err) noexcept;
+		static void* monodroid_dlopen (const char *name, int flags, char **err, bool use_aot_cache) noexcept;
 		static void* monodroid_dlopen (const char *name, int flags, char **err, void *user_data) noexcept;
 		static void* monodroid_dlsym (void *handle, const char *name, char **err, void *user_data);
 		static void* monodroid_dlopen_log_and_return (void *handle, char **err, const char *full_name, bool free_memory, bool need_api_init = false);
-		static DSOCacheEntry* find_dso_cache_entry (hash_t hash) noexcept;
+
+		template<bool AotCache>
+		static DSOCacheEntry* find_dso_cache_entry_common (hash_t hash) noexcept;
+		static DSOCacheEntry* find_only_aot_cache_entry (hash_t hash) noexcept;
+		static DSOCacheEntry* find_only_dso_cache_entry (hash_t hash) noexcept;
+		static DSOCacheEntry* find_any_dso_cache_entry (hash_t hash) noexcept;
 
 		int LocalRefsAreIndirect (JNIEnv *env, jclass runtimeClass, int version);
 		void create_xdg_directory (jstring_wrapper& home, size_t home_len, std::string_view const& relative_path, std::string_view const& environment_variable_name) noexcept;

src/native/monodroid/monodroid-glue.cc

@@ -1012,19 +1012,69 @@ MonodroidRuntime::convert_dl_flags (int flags)
 	return lflags;
 }
 
-force_inline DSOCacheEntry*
-MonodroidRuntime::find_dso_cache_entry (hash_t hash) noexcept
+template<bool AotCache>
+[[gnu::always_inline, gnu::flatten]]
+DSOCacheEntry*
+MonodroidRuntime::find_dso_cache_entry_common (hash_t hash) noexcept
 {
+	DSOCacheEntry *arr;
+	size_t arr_size;
+
+	if constexpr (AotCache) {
+		log_debug (LOG_ASSEMBLY, "Looking for hash 0x%x in AOT cache", hash);
+		arr = aot_dso_cache;
+		arr_size = application_config.number_of_aot_cache_entries;
+	} else {
+		log_debug (LOG_ASSEMBLY, "Looking for hash 0x%x in DSO cache", hash);
+		arr = dso_cache;
+		arr_size = application_config.number_of_dso_cache_entries;
+	}
+
 	auto equal = [](DSOCacheEntry const& entry, hash_t key) -> bool { return entry.hash == key; };
 	auto less_than = [](DSOCacheEntry const& entry, hash_t key) -> bool { return entry.hash < key; };
-	ssize_t idx = Search::binary_search<DSOCacheEntry, equal, less_than> (hash, dso_cache, application_config.number_of_dso_cache_entries);
+
+	ssize_t idx = Search::binary_search<DSOCacheEntry, equal, less_than> (hash, arr, arr_size);
 	if (idx >= 0) {
-		return &dso_cache[idx];
+		return &arr[idx];
 	}
 
 	return nullptr;
 }
 
+[[gnu::always_inline, gnu::flatten]]
+DSOCacheEntry*
+MonodroidRuntime::find_only_aot_cache_entry (hash_t hash) noexcept
+{
+	constexpr bool IsAotCache = true;
+	return find_dso_cache_entry_common<IsAotCache> (hash);
+}
+
+[[gnu::always_inline, gnu::flatten]]
+DSOCacheEntry*
+MonodroidRuntime::find_only_dso_cache_entry (hash_t hash) noexcept
+{
+	constexpr bool IsAotCache = false;
+	return find_dso_cache_entry_common<IsAotCache> (hash);
+}
+
+[[gnu::always_inline, gnu::flatten]]
+DSOCacheEntry*
+MonodroidRuntime::find_any_dso_cache_entry (hash_t hash) noexcept
+{
+	// If we're asked to look in the AOT DSO cache, do it first.  This is because we're likely called from the
+	// MonoVM's dlopen fallback handler and it will not be a request to resolved a p/invoke, but most likely to
+	// find and load an AOT image for a managed assembly.  Since there might be naming/hash conflicts in this
+	// scenario, we look at the AOT cache first.
+	//
+	// See: https://github.com/dotnet/android/issues/9081
+	DSOCacheEntry *ret = find_only_aot_cache_entry (hash);
+	if (ret != nullptr) {
+		return ret;
+	}
+
+	return find_only_dso_cache_entry (hash);
+}
+
 force_inline void*
 MonodroidRuntime::monodroid_dlopen_log_and_return (void *handle, char **err, const char *full_name, bool free_memory, [[maybe_unused]] bool need_api_init)
 {
@@ -1087,12 +1137,13 @@ MonodroidRuntime::monodroid_dlopen_ignore_component_or_load ([[maybe_unused]] ha
 	return monodroid_dlopen_log_and_return (handle, err, name, false /* name_needs_free */);
 }
 
-force_inline void*
-MonodroidRuntime::monodroid_dlopen (const char *name, int flags, char **err) noexcept
+[[gnu::always_inline, gnu::flatten]]
+void*
+MonodroidRuntime::monodroid_dlopen (const char *name, int flags, char **err, bool use_aot_cache) noexcept
 {
 	hash_t name_hash = xxhash::hash (name, strlen (name));
 	log_debug (LOG_ASSEMBLY, "monodroid_dlopen: hash for name '%s' is 0x%zx", name, name_hash);
-	DSOCacheEntry *dso = find_dso_cache_entry (name_hash);
+	DSOCacheEntry *dso = use_aot_cache ? find_any_dso_cache_entry (name_hash) : find_only_dso_cache_entry (name_hash);
 	log_debug (LOG_ASSEMBLY, "monodroid_dlopen: hash match %sfound, DSO name is '%s'", dso == nullptr ? "not " : "", dso == nullptr ? "<unknown>" : dso->name);
 
 	if (dso == nullptr) {
@@ -1149,7 +1200,10 @@ MonodroidRuntime::monodroid_dlopen (const char *name, int flags, char **err, [[m
 		return nullptr;
 	}
 
-	return monodroid_dlopen (name, flags, err);
+	// We're called by MonoVM via a callback, we might need to return an AOT DSO.
+	// See: https://github.com/dotnet/android/issues/9081
+	constexpr bool USE_AOT_CACHE = true;
+	return monodroid_dlopen (name, flags, err, USE_AOT_CACHE);
 }
 
 void*

src/native/monodroid/pinvoke-override-api.cc

@@ -376,7 +376,14 @@ MonodroidRuntime::load_library_symbol (const char *library_name, const char *sym
 	void *lib_handle = dso_handle == nullptr ? nullptr : *dso_handle;
 
 	if (lib_handle == nullptr) {
-		lib_handle = monodroid_dlopen (library_name, MONO_DL_LOCAL, nullptr, nullptr);
+		if (library_name == nullptr) {
+			log_warn (LOG_ASSEMBLY, "load_library_symbol got a NULL library name, not able to look up a symbol");
+			return nullptr;
+		}
+		// In p/invoke mode we don't need to consult the AOT DSO cache. Saves time and removes potential ambiguities
+		// See: https://github.com/dotnet/android/issues/9081
+		constexpr bool USE_AOT_CACHE = false;
+		lib_handle = monodroid_dlopen (library_name, MONO_DL_LOCAL, nullptr, USE_AOT_CACHE);
 		if (lib_handle == nullptr) {
 			log_warn (LOG_ASSEMBLY, "Shared library '%s' not loaded, p/invoke '%s' may fail", library_name, symbol_name);
 			return nullptr;

src/native/xamarin-app-stub/application_dso_stub.cc

@@ -145,6 +145,24 @@ DSOCacheEntry dso_cache[] = {
 	},
 };
 
+DSOCacheEntry aot_dso_cache[] = {
+	{
+		.hash = xamarin::android::xxhash::hash (fake_dso_name, sizeof(fake_dso_name) - 1),
+		.real_name_hash = xamarin::android::xxhash::hash (fake_dso_name, sizeof(fake_dso_name) - 1),
+		.ignore = true,
+		.name = fake_dso_name,
+		.handle = nullptr,
+	},
+
+	{
+		.hash = xamarin::android::xxhash::hash (fake_dso_name2, sizeof(fake_dso_name2) - 1),
+		.real_name_hash = xamarin::android::xxhash::hash (fake_dso_name2, sizeof(fake_dso_name2) - 1),
+		.ignore = true,
+		.name = fake_dso_name2,
+		.handle = nullptr,
+	},
+};
+
 DSOApkEntry dso_apk_entries[2] {};
 
 //

src/native/xamarin-app-stub/xamarin-app.hh

@@ -340,6 +340,7 @@ MONO_API MONO_API_EXPORT AssemblyStoreSingleAssemblyRuntimeData assembly_store_b
 MONO_API MONO_API_EXPORT AssemblyStoreRuntimeData assembly_store;
 
 MONO_API MONO_API_EXPORT DSOCacheEntry dso_cache[];
+MONO_API MONO_API_EXPORT DSOCacheEntry aot_dso_cache[];
 MONO_API MONO_API_EXPORT DSOApkEntry dso_apk_entries[];
 
 //