Native portion of the changes

Author: grendello

src/native/clr/host/typemap.cc

@@ -228,22 +228,22 @@ auto TypeMapper::managed_to_java_release (const char *typeName, const uint8_t *m
 	log_debug (LOG_ASSEMBLY, "typemap: found module matching MVID [{}]"sv, MonoGuidString (mvid).c_str ());
 	hash_t name_hash = xxhash::hash (typeName, strlen (typeName));
 
-	const TypeMapModuleEntry *entry = find_managed_to_java_map_entry (name_hash, match->map, match->entry_count);
+	// We implicitly trust the build process that the indexes are correct. This is by design, the libxamarin-app.so built
+	// with the application is immutable and the build process made sure that the data in it matches the application.
+	const TypeMapModuleEntry *const map = &modules_map_data[match->map_index];
+	const TypeMapModuleEntry *entry = find_managed_to_java_map_entry (name_hash, map, match->entry_count);
 	if (entry == nullptr) [[unlikely]] {
-		if (match->map == nullptr) [[unlikely]] {
-			log_warn (LOG_ASSEMBLY, "typemap: module with MVID [{}] has no associated type map."sv, MonoGuidString (mvid).c_str ());
-			return nullptr;
-		}
-
-		if (match->duplicate_count > 0 && match->duplicate_map != nullptr) {
+		if (match->duplicate_count > 0 && match->duplicate_map_index < std::numeric_limits<decltype (match->duplicate_map_index)>::max ()) {
 			log_debug (
 				LOG_ASSEMBLY,
 				"typemap: searching module [{}] duplicate map for type '{}' (hash {:x})"sv,
 				MonoGuidString (mvid).c_str (),
 				optional_string (typeName),
 				name_hash
 			);
-			entry = find_managed_to_java_map_entry (name_hash, match->duplicate_map, match->duplicate_count);
+
+			const TypeMapModuleEntry *const duplicate_map = &modules_duplicates_data[match->duplicate_map_index];
+			entry = find_managed_to_java_map_entry (name_hash, duplicate_map, match->duplicate_count);
 		}
 
 		if (entry == nullptr) {

src/native/clr/include/xamarin-app.hh

@@ -105,8 +105,8 @@ struct TypeMapModule
 	uint32_t                  duplicate_count;
 	uint32_t                  assembly_name_index;
 	uint32_t                  assembly_name_length;
-	TypeMapModuleEntry const *map;
-	TypeMapModuleEntry const *duplicate_map;
+	uint32_t                  map_index;
+	uint32_t                  duplicate_map_index;
 };
 
 struct TypeMapJava
@@ -349,7 +349,9 @@ extern "C" {
 	[[gnu::visibility("default")]] extern const uint64_t java_type_names_size;
 	[[gnu::visibility("default")]] extern const char managed_type_names[];
 	[[gnu::visibility("default")]] extern const char managed_assembly_names[];
-	[[gnu::visibility("default")]] extern TypeMapModule managed_to_java_map[];
+	[[gnu::visibility("default")]] extern const TypeMapModule managed_to_java_map[];
+	[[gnu::visibility("default")]] extern const TypeMapModuleEntry modules_map_data[];
+	[[gnu::visibility("default")]] extern const TypeMapModuleEntry modules_duplicates_data[];
 	[[gnu::visibility("default")]] extern const TypeMapJava java_to_managed_map[];
 	[[gnu::visibility("default")]] extern const xamarin::android::hash_t java_to_managed_hashes[];
 #endif

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

@@ -33,7 +33,9 @@ const char java_type_names[] = {};
 const uint64_t java_type_names_size = 0;
 const char managed_type_names[] = {};
 const char managed_assembly_names[] = {};
-TypeMapModule managed_to_java_map[] = {};
+const TypeMapModule managed_to_java_map[] = {};
+const TypeMapModuleEntry modules_map_data[] = {};
+const TypeMapModuleEntry modules_duplicates_data[] = {};
 const TypeMapJava java_to_managed_map[] = {};
 const xamarin::android::hash_t java_to_managed_hashes[] = {};
 #endif