Fix marshalling enums to StackSlots

Washi1337 · Jul 14, 2023 · d7e19e8 · d7e19e8
1 parent 8febe6c
commit d7e19e8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Emulation/CliMarshaller.cs b/src/Platforms/Echo.Platforms.AsmResolver/Emulation/CliMarshaller.cs
@@ -28,18 +28,21 @@ private TypeSignature GetElementType(TypeSignature type)
         {
             switch (type.ElementType)
             {
-                case ElementType.Enum:
+                case ElementType.ValueType:
                     if (!_resolvedTypes.TryGetValue(type, out var definition))
                     {
                         definition = type.Resolve();
                         if (definition is not null)
                             _resolvedTypes.Add(type, definition);
                     }
 
-                    if (definition?.GetEnumUnderlyingType() is not { } enumUnderlyingType)
+                    if (!definition?.IsEnum ?? true)
+                        return type;
+
+                    if (definition.GetEnumUnderlyingType() is not { } enumUnderlyingType)
                         throw new CilEmulatorException($"Could not resolve enum type {type.FullName}.");
 
-                    return GetElementType(enumUnderlyingType);
+                    return enumUnderlyingType;
 
                 default:
                     return type;