Fix edge case in minimization step for referenced enum types (#65)

josesimoes · web-flow · commit 581f10281419 · 2020-02-27T17:44:36.000Z
diff --git a/source/MetadataProcessor.Core/nanoAssemblyBuilder.cs b/source/MetadataProcessor.Core/nanoAssemblyBuilder.cs
@@ -335,7 +335,8 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
                         {
                             if (p.ParameterType.DeclaringType != null)
                             {
-                                if (p.ParameterType.Resolve().IsEnum)
+                                var resolvedType = p.ParameterType.Resolve();
+                                if (resolvedType != null && resolvedType.IsEnum)
                                 {
                                     set.Add(p.ParameterType.MetadataToken);
                                 }
@@ -344,12 +345,12 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
                                     set.Add(p.ParameterType.DeclaringType.MetadataToken);
                                 }
                             }
-                            else if (p.ParameterType.MetadataType == MetadataType.Class)
+                            if (p.ParameterType.MetadataType == MetadataType.Class)
                             {
                                 set.Add(p.ParameterType.MetadataToken);
                             }
-                            else if (p.ParameterType.IsValueType &&
-                                    !p.ParameterType.IsPrimitive)
+                            if (p.ParameterType.IsValueType &&
+                                !p.ParameterType.IsPrimitive)
                             {
                                 set.Add(p.ParameterType.MetadataToken);
                             }

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,8 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)`
`335`	`335`	`{`
`336`	`336`	`if (p.ParameterType.DeclaringType != null)`
`337`	`337`	`{`
`338`		`- if (p.ParameterType.Resolve().IsEnum)`
	`338`	`+ var resolvedType = p.ParameterType.Resolve();`
	`339`	`+ if (resolvedType != null && resolvedType.IsEnum)`
`339`	`340`	`{`
`340`	`341`	`set.Add(p.ParameterType.MetadataToken);`
`341`	`342`	`}`
`@@ -344,12 +345,12 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)`
`344`	`345`	`set.Add(p.ParameterType.DeclaringType.MetadataToken);`
`345`	`346`	`}`
`346`	`347`	`}`
`347`		`- else if (p.ParameterType.MetadataType == MetadataType.Class)`
	`348`	`+ if (p.ParameterType.MetadataType == MetadataType.Class)`
`348`	`349`	`{`
`349`	`350`	`set.Add(p.ParameterType.MetadataToken);`
`350`	`351`	`}`
`351`		`- else if (p.ParameterType.IsValueType &&`
`352`		`- !p.ParameterType.IsPrimitive)`
	`352`	`+ if (p.ParameterType.IsValueType &&`
	`353`	`+ !p.ParameterType.IsPrimitive)`
`353`	`354`	`{`
`354`	`355`	`set.Add(p.ParameterType.MetadataToken);`
`355`	`356`	`}`