[WIP] Fix order of ApplicationConfig fields

Author: grendello

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs

@@ -45,7 +45,7 @@ public sealed class ApplicationConfig
 			public bool   uses_assembly_preload;
 			public bool   is_a_bundled_app;
 			public bool   broken_exception_transitions;
-			public bool   instant_run_enabled;
+			public bool   instant_run_enabled ;
 			public bool   jni_add_native_method_registration_attribute_present;
 			public bool   have_runtime_config_blob;
 			public bool   have_assemblies_blob;
@@ -60,11 +60,12 @@ public sealed class ApplicationConfig
 			public uint   android_runtime_jnienv_class_token;
 			public uint   jnienv_initialize_method_token;
 			public uint   jnienv_registerjninatives_method_token;
-			public uint   mono_components_mask;
 			public uint   mam_replacement_type_count;
 			public uint   mam_replacement_method_index_entry_count;
-			public string android_package_name;
-		};
+			public uint   mono_components_mask;
+			public string android_package_name = String.Empty;
+		}
+
 		const uint ApplicationConfigFieldCount = 25;
 
 		const string ApplicationConfigSymbolName = "application_config";
@@ -309,19 +310,19 @@ static ApplicationConfig ReadApplicationConfig (EnvironmentFile envFile)
 						ret.number_of_dso_cache_entries = ConvertFieldToUInt32 ("jnienv_registerjninatives_method_token", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 21: // mono_components_mask: uint32_t / .word | .long
+					case 21: // mam_replacement_type_count: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
-						ret.mono_components_mask = ConvertFieldToUInt32 ("mono_components_mask", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
+						ret.mam_replacement_type_count = ConvertFieldToUInt32 ("mam_replacement_type_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 22: // mam_replacement_type_count: uint32_t / .word | .long
+					case 22: // mam_replacement_method_index_entry_count: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
-						ret.mam_replacement_type_count = ConvertFieldToUInt32 ("mam_replacement_type_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
+						ret.mam_replacement_method_index_entry_count = ConvertFieldToUInt32 ("mam_replacement_method_index_entry_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
-					case 23: // mam_replacement_method_index_entry_count: uint32_t / .word | .long
+					case 23: // mono_components_mask: uint32_t / .word | .long
 						Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
-						ret.mam_replacement_method_index_entry_count = ConvertFieldToUInt32 ("mam_replacement_method_index_entry_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
+						ret.mono_components_mask = ConvertFieldToUInt32 ("mono_components_mask", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
 						break;
 
 					case 24: // android_package_name: string / [pointer type]

src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs

@@ -45,9 +45,9 @@ sealed class ApplicationConfig
 		public uint   android_runtime_jnienv_class_token;
 		public uint   jnienv_initialize_method_token;
 		public uint   jnienv_registerjninatives_method_token;
-		public uint   mono_components_mask;
 		public uint   mam_replacement_type_count;
 		public uint   mam_replacement_method_index_entry_count;
+		public uint   mono_components_mask;
 		public string android_package_name = String.Empty;
 	}
 }

src/monodroid/jni/mam-remapping.cc

@@ -9,20 +9,28 @@ using namespace xamarin::android::internal;
 force_inline bool
 MamRemapping::equal (MAMString const& left, const char *right, size_t right_len) noexcept
 {
+	log_warn (LOG_DEFAULT, __PRETTY_FUNCTION__);
+	log_warn (LOG_DEFAULT, "  left.str == %s; left.length == %u", left.str, left.length);
+	log_warn (LOG_DEFAULT, "  right.str == %s; right.length == %zu", right, right_len);
 	if (left.length != static_cast<uint32_t>(right_len) || left.str[0] != *right) {
+		log_warn (LOG_DEFAULT, "  #0");
 		return false;
 	}
 
 	if (memcmp (left.str, right, right_len) == 0) {
+		log_warn (LOG_DEFAULT, "  #1");
 		return true;
 	}
 
+	log_warn (LOG_DEFAULT, "  #3");
 	return false;
 }
 
 const char*
 MamRemapping::lookup_replacement_type (const char *jniSimpleReference) noexcept
 {
+	log_warn (LOG_DEFAULT, __PRETTY_FUNCTION__);
+	log_warn (LOG_DEFAULT, "  jniSimpleReference == %s", jniSimpleReference);
 	if (application_config.mam_replacement_type_count == 0 || jniSimpleReference == nullptr || *jniSimpleReference == '\0') {
 		return nullptr;
 	}
@@ -43,19 +51,26 @@ MamRemapping::lookup_replacement_type (const char *jniSimpleReference) noexcept
 const MAMReplacementMethod*
 MamRemapping::lookup_replacement_method_info (const char *jniSourceType, const char *jniMethodName, const char *jniMethodSignature) noexcept
 {
+	log_warn (LOG_DEFAULT, __PRETTY_FUNCTION__);
+	log_warn (LOG_DEFAULT, "  jniSourceType == %s; jniMethodName == %s; jniMethodSignature == %s", jniSourceType, jniMethodName, jniMethodSignature);
 	if (application_config.mam_replacement_method_index_entry_count == 0 ||
 	    jniSourceType == nullptr || *jniSourceType == '\0' ||
 	    jniMethodName == nullptr || *jniMethodName == '\0') {
+		log_warn (LOG_DEFAULT, "  #0");
 		return nullptr;
 	}
 
 	size_t source_type_len = strlen (jniSourceType);
 
+	log_warn (LOG_DEFAULT, "  application_config.mam_replacement_method_index_entry_count == %u", application_config.mam_replacement_method_index_entry_count);
 	const MAMIndexTypeEntry *type = nullptr;
 	for (size_t i = 0; i < application_config.mam_replacement_method_index_entry_count; i++) {
+		log_warn (LOG_DEFAULT, "  i == %zu", i);
 		MAMIndexTypeEntry const& entry = mam_method_replacement_index[i];
+		log_warn (LOG_DEFAULT, "  mam_method_replacement_index[%zu].name.str == %s", i, mam_method_replacement_index[i].name.str);
 
-		if (!equal (entry.name, jniSourceType, source_type_len) != 0) {
+		if (!equal (entry.name, jniSourceType, source_type_len)) {
+			log_warn (LOG_DEFAULT, "   -> cont");
 			continue;
 		}
 
@@ -64,6 +79,7 @@ MamRemapping::lookup_replacement_method_info (const char *jniSourceType, const c
 	}
 
 	if (type == nullptr || type->method_count == 0 || type->methods == nullptr) {
+		log_warn (LOG_DEFAULT, "  #1");
 		return nullptr;
 	}
 
@@ -78,9 +94,11 @@ MamRemapping::lookup_replacement_method_info (const char *jniSourceType, const c
 		}
 
 		if (entry.signature.length == 0 || equal (entry.signature, jniMethodSignature, signature_len)) {
+			log_warn (LOG_DEFAULT, "  #2");
 			return &type->methods[i].replacement;
 		}
 	}
 
+	log_warn (LOG_DEFAULT, "  #3");
 	return nullptr;
 }