Merge pull request #1560 from esdrubal/xlstregression

[corlib] ModuleBuilder.GetMethodToken no longer has a module check.

2 files changed, 27 insertions, 2 deletions

diff --git a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
index e5326dc08f6..05bf17c6278 100644
--- a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
@@ -574,8 +574,7 @@ namespace System.Reflection.Emit {
 		{
 			if (entryPoint == null)
 				throw new ArgumentNullException ("entryPoint");
-			if (entryPoint.DeclaringType.Module != this)
-				throw new InvalidOperationException ("entryPoint is not contained in this module");
+
 			throw new NotImplementedException ();
 		}
 
diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/ModuleBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/ModuleBuilderTest.cs
index 783f0937f66..11c8e314d00 100644
--- a/mcs/class/corlib/Test/System.Reflection.Emit/ModuleBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/ModuleBuilderTest.cs
@@ -361,6 +361,32 @@ namespace MonoTests.System.Reflection.Emit
 		}
 
 		[Test]
+		public void GetMethodTokenCrossMethodBuilders ()
+		{
+			AssemblyBuilder ab = genAssembly ();
+			ModuleBuilder moduleb = ab.DefineDynamicModule ("foo.dll", "foo.dll");
+
+			TypeBuilder tb = moduleb.DefineType ("foo");
+			MethodBuilder mb = tb.DefineMethod("Frub", MethodAttributes.Static, null, new Type[] { typeof(IntPtr) });
+			int tok = mb.GetToken().Token;
+			mb.SetImplementationFlags(MethodImplAttributes.NoInlining);
+			ILGenerator ilgen = mb.GetILGenerator();
+			ilgen.Emit(OpCodes.Ret);
+
+			tb.CreateType ();
+
+			var mi = (MethodInfo) moduleb.ResolveMember (tok);
+			Assert.IsNotNull (mi);
+
+			ModuleBuilder moduleb2 = ab.DefineDynamicModule ("foo2.dll", "foo2.dll");
+			var tok2 = moduleb2.GetMethodToken (mi).Token;
+
+			MethodBase mi2 = moduleb.ResolveMethod (tok2);
+			Assert.IsNotNull (mi2);
+			Assert.AreEqual ("Frub", mi.Name);
+		}
+
+		[Test]
 		public void ResolveMemberField ()
 		{
 			var assembly = genAssembly ();