2009-01-28 Jb Evain <jbevain@novell.com>

[mono.git] / mcs / tools / linker / Mono.Linker.Steps / MarkStep.cs

diff --git a/mcs/tools/linker/Mono.Linker.Steps/MarkStep.cs b/mcs/tools/linker/Mono.Linker.Steps/MarkStep.cs
index f47f7e9794e0e6e786417527b5ef5c28a01e7bf9..cadc1116f8dc1462e726f007f4436eeea5e9885e 100644 (file)
--- a/mcs/tools/linker/Mono.Linker.Steps/MarkStep.cs
+++ b/mcs/tools/linker/Mono.Linker.Steps/MarkStep.cs
@@ -155,8 +155,10 @@ namespace Mono.Linker.Steps {
                        if (!ca.Resolved)
                                return;
 
-                       TypeDefinition type = _context.Resolver.Resolve (ca.Constructor.DeclaringType);
                        MarkCustomAttributeParameters (ca);
+
+                       TypeDefinition type = ca.Constructor.DeclaringType.Resolve ();
+
                        MarkCustomAttributeProperties (ca, type);
                        MarkCustomAttributeFields (ca, type);
                }
@@ -259,7 +261,7 @@ namespace Mono.Linker.Steps {
                {
                        FieldDefinition fd = field as FieldDefinition;
                        if (fd == null)
-                               fd = _context.Resolver.Resolve (field);
+                               fd = field.Resolve ();
 
                        return fd;
                }
@@ -400,7 +402,7 @@ namespace Mono.Linker.Steps {
                {
                        TypeDefinition td = type as TypeDefinition;
                        if (td == null)
-                               td = _context.Resolver.Resolve (type);
+                               td = type.Resolve ();
 
                        return td;
                }
@@ -519,7 +521,7 @@ namespace Mono.Linker.Steps {
                {
                        MethodDefinition md = method as MethodDefinition;
                        if (md == null)
-                               md = _context.Resolver.Resolve (method);
+                               md = method.Resolve ();
 
                        return md;
                }