Fix ineffective mapping of custom argument list

mosa · Jul 28, 2023 · b883129 · b883129
1 parent 88dc77a
commit b883129
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/Source/Mosa.Compiler.MosaTypeSystem.CLR/Metadata/ClrMetadataResolver.cs b/Source/Mosa.Compiler.MosaTypeSystem.CLR/Metadata/ClrMetadataResolver.cs
@@ -172,14 +172,14 @@ private MosaCustomAttribute.Argument ToMosaCAArgument(CAArgument arg)
 					value = metadata.Loader.GetType(sig);
 					break;
 				}
-			case CAArgument[] valueArray:
+			case List<CAArgument> values:
 				{
-					var resultArray = new MosaCustomAttribute.Argument[valueArray.Length];
+					var resultArray = new MosaCustomAttribute.Argument[values.Count];
 					for (var i = 0; i < resultArray.Length; i++)
 					{
-						resultArray[i] = ToMosaCAArgument(valueArray[i]);
+						resultArray[i] = ToMosaCAArgument(values[i]);
 					}
-
+					value = resultArray;
 					break;
 				}
 		}

diff --git a/Source/Mosa.UnitTests/Regression/Issue1093.cs b/Source/Mosa.UnitTests/Regression/Issue1093.cs
@@ -0,0 +1,21 @@
+// Copyright (c) MOSA Project. Licensed under the New BSD License.
+using System;
+
+namespace Mosa.UnitTests.Regression;
+
+public static class Issue1093
+{
+	[MosaUnitTest]
+	public static bool TestIssue1093()
+	{
+		return true;
+	}
+
+	public class Attr : Attribute
+	{
+		public Attr(byte[] flags) { }
+	}
+
+	[Attr(new byte[] { 1, 2, 3 })]
+	public static int FooBar;
+}
diff --git a/Source/Mosa.Utility.UnitTests/Mosa.Utility.UnitTests.csproj b/Source/Mosa.Utility.UnitTests/Mosa.Utility.UnitTests.csproj
@@ -97,6 +97,8 @@
 		<Compile Include="..\Mosa.UnitTests\ValueType\InitStructTests.cs" Link="Tests\ValueType\InitStructTests.cs" />
 		<Compile Include="..\Mosa.UnitTests\ValueType\StructTests.cs" Link="Tests\ValueType\StructTests.cs" />
 		<Compile Include="..\Mosa.UnitTests\ValueType\ValueTypeTests.cs" Link="Tests\ValueType\ValueTypeTests.cs" />
+
+		<Compile Include="..\Mosa.UnitTests\Regression\Issue1093.cs" Link="Tests\Regression\Issue1093.cs" />
 
 		<!--<Compile Include="..\Mosa.UnitTests\Mosa.Collections.Generic\BitFlagsTests.cs" Link="Tests\Mosa.Collections.Generic\BitFlagsTests.cs" />-->
 	</ItemGroup>