Fix minimization of return types with arrays (#82)

josesimoes · web-flow · commit 079c26fd4a91 · 2020-03-19T11:36:56.000Z
***UPDATE_DEPENDENTS***
diff --git a/source/MetadataProcessor.Core/nanoAssemblyBuilder.cs b/source/MetadataProcessor.Core/nanoAssemblyBuilder.cs
@@ -433,7 +433,13 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
                                 }
                                 else
                                 {
-                                    set.Add(fr.DeclaringType.MetadataToken);
+                                    if ( fr.FieldType.FullName != "System.Void" &&
+                                         fr.FieldType.FullName != "System.String" &&
+                                         fr.FieldType.FullName != "System.Object" &&
+                                        !fr.FieldType.IsPrimitive)
+                                    {
+                                        set.Add(fr.FieldType.MetadataToken);
+                                    }
                                 }
                             }
                             else if (!fr.FieldType.IsPrimitive &&
@@ -537,7 +543,13 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
                         }
                         else
                         {
-                            set.Add(fd.DeclaringType.MetadataToken);
+                            if (fd.FieldType.GetElementType().FullName != "System.Void" &&
+                                fd.FieldType.GetElementType().FullName != "System.String" &&
+                                fd.FieldType.GetElementType().FullName != "System.Object" &&
+                                !fd.FieldType.GetElementType().IsPrimitive)
+                            {
+                                set.Add(fd.FieldType.GetElementType().MetadataToken);
+                            }
                         }
                     }
                     else if (!fd.FieldType.IsValueType &&
@@ -578,7 +590,13 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
                         }
                         else
                         {
-                            set.Add(md.DeclaringType.MetadataToken);
+                            if (md.ReturnType.GetElementType().FullName != "System.Void" &&
+                                md.ReturnType.GetElementType().FullName != "System.String" &&
+                                md.ReturnType.GetElementType().FullName != "System.Object" &&
+                                !md.ReturnType.GetElementType().IsPrimitive)
+                            {
+                                set.Add(md.ReturnType.GetElementType().MetadataToken);
+                            }
                         }
                     }
                     else if (!md.ReturnType.IsValueType &&

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,13 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)`
`433`	`433`	`}`
`434`	`434`	`else`
`435`	`435`	`{`
`436`		`- set.Add(fr.DeclaringType.MetadataToken);`
	`436`	`+ if ( fr.FieldType.FullName != "System.Void" &&`
	`437`	`+ fr.FieldType.FullName != "System.String" &&`
	`438`	`+ fr.FieldType.FullName != "System.Object" &&`
	`439`	`+ !fr.FieldType.IsPrimitive)`
	`440`	`+ {`
	`441`	`+ set.Add(fr.FieldType.MetadataToken);`
	`442`	`+ }`
`437`	`443`	`}`
`438`	`444`	`}`
`439`	`445`	`else if (!fr.FieldType.IsPrimitive &&`
`@@ -537,7 +543,13 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)`
`537`	`543`	`}`
`538`	`544`	`else`
`539`	`545`	`{`
`540`		`- set.Add(fd.DeclaringType.MetadataToken);`
	`546`	`+ if (fd.FieldType.GetElementType().FullName != "System.Void" &&`
	`547`	`+ fd.FieldType.GetElementType().FullName != "System.String" &&`
	`548`	`+ fd.FieldType.GetElementType().FullName != "System.Object" &&`
	`549`	`+ !fd.FieldType.GetElementType().IsPrimitive)`
	`550`	`+ {`
	`551`	`+ set.Add(fd.FieldType.GetElementType().MetadataToken);`
	`552`	`+ }`
`541`	`553`	`}`
`542`	`554`	`}`
`543`	`555`	`else if (!fd.FieldType.IsValueType &&`
`@@ -578,7 +590,13 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)`
`578`	`590`	`}`
`579`	`591`	`else`
`580`	`592`	`{`
`581`		`- set.Add(md.DeclaringType.MetadataToken);`
	`593`	`+ if (md.ReturnType.GetElementType().FullName != "System.Void" &&`
	`594`	`+ md.ReturnType.GetElementType().FullName != "System.String" &&`
	`595`	`+ md.ReturnType.GetElementType().FullName != "System.Object" &&`
	`596`	`+ !md.ReturnType.GetElementType().IsPrimitive)`
	`597`	`+ {`
	`598`	`+ set.Add(md.ReturnType.GetElementType().MetadataToken);`
	`599`	`+ }`
`582`	`600`	`}`
`583`	`601`	`}`
`584`	`602`	`else if (!md.ReturnType.IsValueType &&`