(RSRP-499137) ImportLogic: skip special treatment for static struct f…

…ields
JetBrains · Nov 1, 2024 · 136dda8 · 136dda8
1 parent ed9356a
commit 136dda8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/Refasmer/Importer/ImportLogic.cs b/src/Refasmer/Importer/ImportLogic.cs
@@ -41,43 +41,48 @@ private TypeDefinitionHandle ImportTypeDefinitionSkeleton( TypeDefinitionHandle
                 Import(src.BaseType), NextFieldHandle(), NextMethodHandle());
 
             Trace?.Invoke($"Imported {_reader.ToString(src)} -> {RowId(dstHandle):X}");
-
+    
             using var _ = WithLogPrefix($"[{_reader.ToString(src)}]");
 
             var isValueType = _reader.GetFullname(src.BaseType) == "System::ValueType";
             var forcePreservePrivateFields = isValueType && !Filter.OmitNonApiMembers;
 
-            List<FieldDefinition> importedFields = null;
-            List<FieldDefinition> skippedFields = null;
+            List<FieldDefinition> importedInstanceFields = null;
+            List<FieldDefinition> skippedInstanceFields = null;
 
             if (forcePreservePrivateFields)
                 Trace?.Invoke($"{_reader.ToString(src)} is ValueType, all fields should be imported");
             else
             {
-                importedFields = [];
-                skippedFields = [];                    
+                importedInstanceFields = [];
+                skippedInstanceFields = [];                    
             }
 
             foreach (var srcFieldHandle in src.GetFields())
             {
                 var srcField = _reader.GetFieldDefinition(srcFieldHandle);
+                var isStatic = (srcField.Attributes & FieldAttributes.Static) != 0;
+                var isForcedToInclude = forcePreservePrivateFields && !isStatic;
 
-                if (!forcePreservePrivateFields && Filter?.AllowImport(srcField, _reader) == false)
+                if (!isForcedToInclude && Filter?.AllowImport(srcField, _reader) == false)
                 {
                     Trace?.Invoke($"Not imported {_reader.ToString(srcField)}");
-                    skippedFields?.Add(srcField);
+                    if (!isStatic)
+                        skippedInstanceFields?.Add(srcField);
+
                     continue;
                 }
 
                 var dstFieldHandle = _builder.AddFieldDefinition(srcField.Attributes, ImportValue(srcField.Name),
                     ImportSignatureWithHeader(srcField.Signature));
                 _fieldDefinitionCache.Add(srcFieldHandle, dstFieldHandle);
                 Trace?.Invoke($"Imported {_reader.ToString(srcFieldHandle)} -> {RowId(dstFieldHandle):X}");
-                importedFields?.Add(srcField);
+                if (!isStatic)
+                    importedInstanceFields?.Add(srcField);
             }
 
             if (!forcePreservePrivateFields)
-                PostProcessSkippedValueTypeFields(skippedFields, importedFields);
+                PostProcessSkippedValueTypeFields(skippedInstanceFields, importedInstanceFields);
 
             var implementations = src.GetMethodImplementations()
                 .Select(_reader.GetMethodImplementation)

diff --git a/tests/Refasmer.Tests/IntegrationTests.cs b/tests/Refasmer.Tests/IntegrationTests.cs
@@ -29,7 +29,8 @@ public async Task CheckRefasmedType(string typeName)
     [TestCase("RefasmerTestAssembly.BlittableStructWithPrivateFields")]
     [TestCase("RefasmerTestAssembly.NonBlittableStructWithPrivateFields")]
     [TestCase("RefasmerTestAssembly.NonBlittableGraph")]
-
+    [TestCase("RefasmerTestAssembly.EmptyStructWithStaticMember")]
+    [TestCase("RefasmerTestAssembly.NonEmptyStructWithStaticMember")]
     public async Task CheckRefasmedTypeOmitNonApi(string typeName)
     {
         var assemblyPath = await BuildTestAssembly();