From 10b20b0a27d7cfea33ae18eaa924296e21762734 Mon Sep 17 00:00:00 2001 From: Jb Evain Date: Thu, 11 Feb 2010 23:25:23 +0000 Subject: [PATCH] 2010-02-12 Jb Evain * AssemblyStripper.cs: properly set the rva of methods with no body. svn path=/trunk/mcs/; revision=151565 --- mcs/class/Mono.Cecil/ChangeLog | 5 +++++ mcs/class/Mono.Cecil/Mono.Cecil/AssemblyStripper.cs | 13 ++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/mcs/class/Mono.Cecil/ChangeLog b/mcs/class/Mono.Cecil/ChangeLog index cfd6d7b0706..28839cb5cf8 100644 --- a/mcs/class/Mono.Cecil/ChangeLog +++ b/mcs/class/Mono.Cecil/ChangeLog @@ -1,3 +1,8 @@ +2010-02-12 Jb Evain + + * AssemblyStripper.cs: properly set the rva of methods with + no body. + 2010-01-06 Rodrigo B. de Oliveira * Mono.Cecil.csproj diff --git a/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyStripper.cs b/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyStripper.cs index f8e577e56b9..77e72e181d8 100644 --- 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; } } -- 2.11.4.GIT