Fixes on minimize assembly (#34)

Author: josesimoes

source/MetadataProcessor.Console/Program.cs

@@ -244,11 +244,11 @@ public static void Main(string[] args)
                 {
                     md.AddClassToExclude(args[++i]);
                 }
-                else if (arg == "-minimize" && i + 1 < args.Length)
+                else if (arg == "-minimize")
                 {
                     md.Minimize(md.PeFileName);
                 }
-                else if (arg == "-verbose" && i + 1 < args.Length)
+                else if (arg == "-verbose")
                 {
                     md.Verbose = true;
                 }

source/MetadataProcessor.Core/Tables/nanoAttributesTable.cs

@@ -20,18 +20,18 @@ public sealed class nanoAttributesTable : InanoTable
         /// <summary>
         /// List of custom attributes in Mono.Cecil format for all internal types.
         /// </summary>
-        private readonly IEnumerable<Tuple<CustomAttribute, ushort>> _typesAttributes;
+        private IEnumerable<Tuple<CustomAttribute, ushort>> _typesAttributes;
 
         /// <summary>
         /// List of custom attributes in Mono.Cecil format for all internal fields.
         /// </summary>
         /// 
-        private readonly IEnumerable<Tuple<CustomAttribute, ushort>> _fieldsAttributes;
+        private IEnumerable<Tuple<CustomAttribute, ushort>> _fieldsAttributes;
 
         /// <summary>
         /// List of custom attributes in Mono.Cecil format for all internal methods.
         /// </summary>
-        private readonly IEnumerable<Tuple<CustomAttribute, ushort>> _methodsAttributes;
+        private IEnumerable<Tuple<CustomAttribute, ushort>> _methodsAttributes;
 
         /// <summary>
         /// Assembly tables context - contains all tables used for building target assembly.
@@ -92,5 +92,51 @@ private void WriteAttributes(
                 writer.WriteUInt16(_context.SignaturesTable.GetOrCreateSignatureId(attribute));
             }
         }
+
+        /// <summary>
+        /// Remove unused items from attribute tables.
+        /// </summary>
+        public void RemoveUnusedItems(HashSet<MetadataToken> set)
+        {
+            // build a collection of the current items that are present in the used items set
+            List<Tuple<CustomAttribute, ushort>> usedItems = new List<Tuple<CustomAttribute, ushort>>();
+
+            // types attributes
+            foreach (var item in _typesAttributes
+                                    .Where(item => set.Contains(((IMetadataTokenProvider)item.Item1.Constructor).MetadataToken)))
+            {
+                usedItems.Add(item);
+            }
+
+            // re-create the items dictionary with the used items only
+            _typesAttributes = usedItems
+            .Select(a => new Tuple<CustomAttribute, ushort>(a.Item1, a.Item2));
+
+            // fields attributes
+            usedItems = new List<Tuple<CustomAttribute, ushort>>();
+
+            foreach (var item in _fieldsAttributes
+                                    .Where(item => set.Contains(((IMetadataTokenProvider)item.Item1.Constructor).MetadataToken)))
+            {
+                usedItems.Add(item);
+            }
+
+            // re-create the items dictionary with the used items only
+            _fieldsAttributes = usedItems
+            .Select(a => new Tuple<CustomAttribute, ushort>(a.Item1, a.Item2));
+
+            // methods attributes
+            usedItems = new List<Tuple<CustomAttribute, ushort>>();
+
+            foreach (var item in _methodsAttributes
+                                    .Where(item => set.Contains(((IMetadataTokenProvider)item.Item1.Constructor).MetadataToken)))
+            {
+                usedItems.Add(item);
+            }
+
+            // re-create the items dictionary with the used items only
+            _methodsAttributes = usedItems
+            .Select(a => new Tuple<CustomAttribute, ushort>(a.Item1, a.Item2));
+        }
     }
 }

source/MetadataProcessor.Core/nanoAssemblyBuilder.cs

@@ -161,11 +161,12 @@ public void Minimize()
             _tablesContext.TypeDefinitionTable.RemoveUnusedItems(set);
             _tablesContext.TypeReferencesTable.RemoveUnusedItems(set);
             _tablesContext.TypeDefinitionTable.ResetByteCodeOffsets();
+            _tablesContext.AttributesTable.RemoveUnusedItems(set);
             _tablesContext.ResetByteCodeTable();
             _tablesContext.ResetSignaturesTable();
             _tablesContext.ResetStringsTable();
-
-            // renormalize type definitions look-up tables
+             
+            // renormalise type definitions look-up tables
             // by removing items that are not used
 
             foreach (var c in _tablesContext.TypeDefinitionTable.Items)
@@ -277,7 +278,13 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
 
                 case TokenType.MemberRef:
                     var mr = _tablesContext.MethodReferencesTable.Items.FirstOrDefault(i => i.MetadataToken == token);
-                    // TODO
+
+                    if (mr != null &&
+                        mr.DeclaringType != null)
+                    {
+                        set.Add(mr.DeclaringType.MetadataToken);
+                    }
+                
                     break;
 
                 case TokenType.TypeSpec:
@@ -345,14 +352,18 @@ private HashSet<MetadataToken> BuildDependencyList(MetadataToken token)
 
                 case TokenType.Field:
                     var fd = _tablesContext.FieldsTable.Items.FirstOrDefault(i => i.MetadataToken == token);
-                    set.Add(fd.MetadataToken);
+
+                    if (fd is TypeReference)
+                    {
+                        set.Add(fd.MetadataToken);
+                    }
 
                     // attributes
                     foreach (var c in fd.CustomAttributes)
                     {
-                        if (!_tablesContext.ClassNamesToExclude.Contains(c.AttributeType.FullName))
-                        {
-                            set.Add(c.AttributeType.MetadataToken);
+                        if (!_tablesContext.ClassNamesToExclude.Contains(c.AttributeType.Name))
+                        {   
+                            set.Add(c.Constructor.MetadataToken);
                         }
                     }
 
@@ -427,9 +438,9 @@ i.Operand is TypeDefinition ||
                     // attributes
                     foreach (var c in md.CustomAttributes)
                     {
-                        if (!_tablesContext.ClassNamesToExclude.Contains(c.AttributeType.FullName))
+                        if (!_tablesContext.ClassNamesToExclude.Contains(c.AttributeType.Name))
                         {
-                            set.Add(c.AttributeType.MetadataToken);
+                            set.Add(c.Constructor.MetadataToken);
                         }
                     }