More updates

Author: grendello

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

@@ -88,7 +88,7 @@ sealed class XamarinAndroidBundledAssembly
 			public IntPtr data;
 			public uint   name_length;
 
-			[NativeAssemblerString (PointerToSymbol = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol)]
 			public string name;
 		};
 

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

@@ -16,7 +16,7 @@ sealed class CompressedAssemblyDescriptor
 			public uint   uncompressed_file_size;
 			public bool   loaded;
 
-			[NativeAssemblerString (PointerToSymbol = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol)]
 			public string data = String.Empty;
 		};
 
@@ -26,7 +26,7 @@ sealed class CompressedAssemblies
 		{
 			public uint count;
 
-			[NativeAssemblerString (PointerToSymbol = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol)]
 			public string descriptors;
 		};
 

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

@@ -15,22 +15,14 @@ namespace Xamarin.Android.Tasks
 {
 	static class ELFHelper
 	{
-		static ConcurrentDictionary<string, bool> checkedDSOs = new ConcurrentDictionary<string, bool> (StringComparer.OrdinalIgnoreCase);
-
 		public static bool IsEmptyAOTLibrary (TaskLoggingHelper log, string path)
 		{
 			if (String.IsNullOrEmpty (path) || !File.Exists (path)) {
 				return false;
 			}
 
-			if (checkedDSOs.TryGetValue (path, out bool isEmpty)) {
-				return isEmpty;
-			}
-
 			try {
-				isEmpty = IsEmptyAOTLibrary (log, path, ELFReader.Load (path));
-				checkedDSOs.TryAdd (path, isEmpty); // it's possible some other thread already added it, thus we don't care about the return value
-				return isEmpty;
+				return IsEmptyAOTLibrary (log, path, ELFReader.Load (path));
 			} catch (Exception ex) {
 				log.LogWarning ($"Attempt to check whether '{path}' is a valid ELF file failed with exception, ignoring AOT check for the file.");
 				log.LogWarningFromException (ex, showStackTrace: true);

src/Xamarin.Android.Build.Tasks/Utilities/NativeAssemblyGenerator/Arm32NativeAssemblyGenerator.cs

@@ -53,17 +53,17 @@ protected override void ConfigureTypeMappings (Dictionary<Type, NativeType?> map
 
 			// Alignments and sizes as per https://github.com/ARM-software/abi-aa/blob/320a56971fdcba282b7001cf4b84abb4fd993131/aapcs32/aapcs32.rst#fundamental-data-types
 			// Assembler type directives are described in https://sourceware.org/binutils/docs-2.37/as/index.html
-			ConfigureTypeMapping<short>	 (".short", size: 2, alignment: 2);
+			ConfigureTypeMapping<short>  (".short", size: 2, alignment: 2);
 			ConfigureTypeMapping<ushort> (".short", size: 2, alignment: 2);
-			ConfigureTypeMapping<int>	 (".long",	size: 4, alignment: 4);
-			ConfigureTypeMapping<uint>	 (".long",	size: 4, alignment: 4);
-			ConfigureTypeMapping<long>	 (".long",	size: 8, alignment: 8);
-			ConfigureTypeMapping<ulong>	 (".long",	size: 8, alignment: 8);
-			ConfigureTypeMapping<float>	 (".long",	size: 4, alignment: 4);
-			ConfigureTypeMapping<double> (".long",	size: 8, alignment: 8);
-			ConfigureTypeMapping<nint>	 (".long",	size: 4, alignment: 4);
-			ConfigureTypeMapping<nuint>	 (".long",	size: 4, alignment: 4);
-			ConfigureTypeMapping<IntPtr> (".long",	size: 4, alignment: 4);
+			ConfigureTypeMapping<int>    (".long",  size: 4, alignment: 4);
+			ConfigureTypeMapping<uint>   (".long",  size: 4, alignment: 4);
+			ConfigureTypeMapping<long>   (".long",  size: 8, alignment: 8);
+			ConfigureTypeMapping<ulong>  (".long",  size: 8, alignment: 8);
+			ConfigureTypeMapping<float>  (".long",  size: 4, alignment: 4);
+			ConfigureTypeMapping<double> (".long",  size: 8, alignment: 8);
+			ConfigureTypeMapping<nint>   (".long",  size: 4, alignment: 4);
+			ConfigureTypeMapping<nuint>  (".long",  size: 4, alignment: 4);
+			ConfigureTypeMapping<IntPtr> (".long",  size: 4, alignment: 4);
 		}
 
 		public override void WriteFileTop ()

src/Xamarin.Android.Build.Tasks/Utilities/NativeAssemblyGenerator/NativeAssemblerAttribute.cs

@@ -11,12 +11,41 @@ class NativeAssemblerAttribute : Attribute
 		public string? Name          { get; set; }
 	}
 
+	enum AssemblerStringFormat
+	{
+		/// <summary>
+		/// Local string label is automatically generated for the string, this is the default behavior
+		/// </summary>
+		Automatic,
+
+		/// <summary>
+		/// String is output as an inline (no pointer) array/buffer filled directly with string data
+		/// </summary>
+		InlineArray,
+
+		/// <summary>
+		/// String is output as a pointer to symbol whose name is contents of the string being processed
+		PointerToSymbol,
+	}
+
 	[AttributeUsage (AttributeTargets.Field | AttributeTargets.Property, Inherited = true)]
 	class NativeAssemblerStringAttribute : NativeAssemblerAttribute
 	{
-		public bool Inline          { get; set; }
+		AssemblerStringFormat format;
+
+		public bool Inline          => format == AssemblerStringFormat.InlineArray;
 		public bool PadToMaxLength  { get; set; }
-		public bool PointerToSymbol { get; set; }
+		public bool PointerToSymbol => format == AssemblerStringFormat.PointerToSymbol;
+
+		public NativeAssemblerStringAttribute ()
+		{
+			format = AssemblerStringFormat.Automatic;
+		}
+
+		public NativeAssemblerStringAttribute (AssemblerStringFormat format)
+		{
+			this.format = format;
+		}
 	}
 
 	[AttributeUsage (AttributeTargets.Class, Inherited = true)]

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

@@ -35,10 +35,10 @@ public override string GetComment (object data, string fieldName)
 		// src/monodroid/jni/xamarin-app.hh TypeMapEntry structure
 		sealed class TypeMapEntry
 		{
-			[NativeAssemblerString (PointerToSymbol = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol)]
 			public string from;
 
-			[NativeAssemblerString (PointerToSymbol = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol)]
 			public string to;
 		};
 
@@ -55,10 +55,10 @@ sealed class TypeMap
 			[NativeAssembler (UsesDataProvider = true)]
 			public IntPtr data = IntPtr.Zero; // unused in Debug mode
 
-			[NativeAssemblerString (PointerToSymbol = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol)]
 			public string        java_to_managed;
 
-			[NativeAssemblerString (PointerToSymbol = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol)]
 			public string        managed_to_java;
 		};
 

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

@@ -71,13 +71,13 @@ sealed class TypeMapModule
 			public uint   entry_count;
 			public uint   duplicate_count;
 
-			[NativeAssemblerString (PointerToSymbol = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol)]
 			public string map;
 
-			[NativeAssemblerString (PointerToSymbol = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol)]
 			public string duplicate_map;
 
-			[NativeAssemblerString (PointerToSymbol = true, UsesDataProvider = true)]
+			[NativeAssemblerString (AssemblerStringFormat.PointerToSymbol, UsesDataProvider = true)]
 			public string assembly_name;
 			public IntPtr image;
 			public uint   java_name_width;
@@ -95,7 +95,7 @@ sealed class TypeMapJava
 			public uint module_index;
 			public uint type_token_id;
 
-			[NativeAssemblerString (Inline = true, PadToMaxLength = true)]
+			[NativeAssemblerString (AssemblerStringFormat.InlineArray, PadToMaxLength = true)]
 			public string  java_name;
 		}