2010-02-12 Jb Evain <jbevain@novell.com>

	* AssemblyStripper.cs: properly set the rva of methods with
	no body.

svn path=/trunk/mcs/; revision=151565

diff --git a/mcs/class/Mono.Cecil/ChangeLog b/mcs/class/Mono.Cecil/ChangeLog
index cfd6d7b07061e7f58d868e12987b8ce3b5171cee..28839cb5cf8427b0ffd2f627c9598a4686028276 100644 (file)
--- a/mcs/class/Mono.Cecil/ChangeLog
+++ b/mcs/class/Mono.Cecil/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-12  Jb Evain  <jbevain@novell.com>
+
+       * AssemblyStripper.cs: properly set the rva of methods with
+       no body.
+
 2010-01-06     Rodrigo B. de Oliveira <rodrigo@unity.com>
 
        * Mono.Cecil.csproj

diff --git a/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyStripper.cs b/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyStripper.cs
index f8e577e56b9a094ced60197cf9b401dcff95334a..77e72e181d8e21fe1dcd36453349b099f8bf3732 100644 (file)
--- a/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyStripper.cs
+++ b/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyStripper.cs
@@ -150,11 +150,14 @@ namespace Mono.Cecil {
 
                                MethodDefinition method = (MethodDefinition) assembly.MainModule.LookupByToken (methodToken);
 
-                               method_rva = method_rva != RVA.Zero
-                                       ? method_rva
-                                       : reflection_writer.CodeWriter.WriteMethodBody (method);
-
-                               methodRow.RVA = method_rva;
+                               if (method.HasBody) {
+                                       method_rva = method_rva != RVA.Zero
+                                               ? method_rva
+                                               : reflection_writer.CodeWriter.WriteMethodBody (method);
+
+                                       methodRow.RVA = method_rva;
+                               } else
+                                       methodRow.RVA = RVA.Zero;
                        }
                }