Author: jbevain
Date: 2007-07-21 12:08:46 -0400 (Sat, 21 Jul 2007)
New Revision: 82417

Modified:
   trunk/mcs/tools/linker/ChangeLog
   trunk/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs
Log:
2007-07-21  Jb Evain  <[EMAIL PROTECTED]>

        * Mono.Linker.Steps/SweepStep.cs:
                Sweep memberrefs along with the typerefs.


Modified: trunk/mcs/tools/linker/ChangeLog
===================================================================
--- trunk/mcs/tools/linker/ChangeLog    2007-07-21 15:34:17 UTC (rev 82416)
+++ trunk/mcs/tools/linker/ChangeLog    2007-07-21 16:08:46 UTC (rev 82417)
@@ -1,3 +1,8 @@
+2007-07-21  Jb Evain  <[EMAIL PROTECTED]>
+
+       * Mono.Linker.Steps/SweepStep.cs:
+               Sweep memberrefs along with the typerefs.
+
 2007-07-20  Jb Evain  <[EMAIL PROTECTED]>
 
        * Mono.Linker.Steps/AdjustVisibilityStep.cs:

Modified: trunk/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs
===================================================================
--- trunk/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs       2007-07-21 
15:34:17 UTC (rev 82416)
+++ trunk/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs       2007-07-21 
16:08:46 UTC (rev 82417)
@@ -69,11 +69,21 @@
                                        continue;
 
                                TypeReference typeRef = module.TypeReferences 
[type.FullName];
-                               if (AssemblyMatch (assembly, typeRef))
+                               if (AssemblyMatch (assembly, typeRef)) {
+                                       SweepMemberReferences (module, typeRef);
                                        module.TypeReferences.Remove (typeRef);
+                               }
                        }
                }
 
+               static void SweepMemberReferences (ModuleDefinition module, 
TypeReference reference)
+               {
+                       foreach (MemberReference member in Clone 
(module.MemberReferences)) {
+                               if (member.DeclaringType == reference)
+                                       module.MemberReferences.Remove (member);
+                       }
+               }
+
                static bool AssemblyMatch (AssemblyDefinition assembly, 
TypeReference type)
                {
                        AssemblyNameReference reference = type.Scope as 
AssemblyNameReference;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to