Removed remaining ConstructorBuilder usages.

4 files changed, 8 insertions, 10 deletions

diff --git a/ikvmc/AotTypeWrapper.cs b/ikvmc/AotTypeWrapper.cs
index 4860f64b..a81f22ef 100644
--- a/ikvmc/AotTypeWrapper.cs
+++ b/ikvmc/AotTypeWrapper.cs
@@ -117,7 +117,7 @@ namespace IKVM.Internal
 			private readonly AotTypeWrapper wrapper;
 			private readonly TypeBuilder typeBuilder;
 			private readonly MethodWrapper[] methods;
-			private ConstructorInfo baseSerializationCtor;
+			private MethodBuilder baseSerializationCtor;
 
 			internal WorkaroundBaseClass(AotTypeWrapper wrapper, TypeBuilder typeBuilder, MethodWrapper[] methods)
 			{
@@ -126,7 +126,7 @@ namespace IKVM.Internal
 				this.methods = methods;
 			}
 
-			internal ConstructorInfo GetSerializationConstructor()
+			internal MethodBuilder GetSerializationConstructor()
 			{
 				if (baseSerializationCtor == null)
 				{
@@ -229,7 +229,7 @@ namespace IKVM.Internal
 			}
 		}
 
-		internal void AddXmlMapParameterAttributes(MethodBase method, string className, string methodName, string methodSig, ref ParameterBuilder[] pbs)
+		internal void AddXmlMapParameterAttributes(MethodBuilder method, string className, string methodName, string methodSig, ref ParameterBuilder[] pbs)
 		{
 			IKVM.Internal.MapXml.Param[] parameters = classLoader.GetXmlMapParameters(className, methodName, methodSig);
 			if(parameters != null)
@@ -1283,7 +1283,7 @@ namespace IKVM.Internal
 			return mw;
 		}
 
-		internal override ConstructorInfo GetBaseSerializationConstructor()
+		internal override MethodBase GetBaseSerializationConstructor()
 		{
 			if (workaroundBaseClass != null)
 			{
diff --git a/ikvmc/CompilerClassLoader.cs b/ikvmc/CompilerClassLoader.cs
index b4a98d98..e0b14186 100644
--- a/ikvmc/CompilerClassLoader.cs
+++ b/ikvmc/CompilerClassLoader.cs
@@ -2165,7 +2165,7 @@ namespace IKVM.Internal
 			}
 		}
 
-		internal static void AddDeclaredExceptions(MethodBase mb, IKVM.Internal.MapXml.Throws[] throws)
+		internal static void AddDeclaredExceptions(MethodBuilder mb, IKVM.Internal.MapXml.Throws[] throws)
 		{
 			if (throws != null)
 			{
diff --git a/ikvmc/FakeTypes.cs b/ikvmc/FakeTypes.cs
index 95bdd429..ee85e7b1 100644
--- a/ikvmc/FakeTypes.cs
+++ b/ikvmc/FakeTypes.cs
@@ -81,7 +81,7 @@ namespace IKVM.Internal
 			TypeWrapper enumTypeWrapper = loader.LoadClassByDottedName("java.lang.Enum");
 			enumTypeWrapper.Finish();
 			tb.SetParent(enumTypeWrapper.TypeAsBaseType);
-			CodeEmitter ilgen = CodeEmitter.Create(tb.DefineConstructor(MethodAttributes.Private, CallingConventions.Standard, new Type[] { Types.String, Types.Int32 }));
+			CodeEmitter ilgen = CodeEmitter.Create(ReflectUtil.DefineConstructor(tb, MethodAttributes.Private, new Type[] { Types.String, Types.Int32 }));
 			ilgen.Emit(OpCodes.Ldarg_0);
 			ilgen.Emit(OpCodes.Ldarg_1);
 			ilgen.Emit(OpCodes.Ldarg_2);
diff --git a/ikvmc/Proxy.cs b/ikvmc/Proxy.cs
index 4054d969..99edb9a5 100644
--- a/ikvmc/Proxy.cs
+++ b/ikvmc/Proxy.cs
@@ -237,8 +237,7 @@ namespace IKVM.Internal
 
 		private static void CreateConstructor(TypeBuilder tb)
 		{
-			ConstructorBuilder cb = tb.DefineConstructor(MethodAttributes.Public, CallingConventions.Standard, new Type[] { invocationHandlerClass.TypeAsSignatureType });
-			CodeEmitter ilgen = CodeEmitter.Create(cb);
+			CodeEmitter ilgen = CodeEmitter.Create(ReflectUtil.DefineConstructor(tb, MethodAttributes.Public, new Type[] { invocationHandlerClass.TypeAsSignatureType }));
 			ilgen.Emit(OpCodes.Ldarg_0);
 			ilgen.Emit(OpCodes.Ldarg_1);
 			proxyConstructor.EmitCall(ilgen);
@@ -344,8 +343,7 @@ namespace IKVM.Internal
 
 		private static void CreateStaticInitializer(TypeBuilder tb, List<ProxyMethod> methods)
 		{
-			ConstructorBuilder cb = tb.DefineConstructor(MethodAttributes.Static, CallingConventions.Standard, Type.EmptyTypes);
-			CodeEmitter ilgen = CodeEmitter.Create(cb);
+			CodeEmitter ilgen = CodeEmitter.Create(ReflectUtil.DefineTypeInitializer(tb));
 			CodeEmitterLocal callerID = ilgen.DeclareLocal(CoreClasses.ikvm.@internal.CallerID.Wrapper.TypeAsSignatureType);
 			TypeBuilder tbCallerID = DynamicTypeWrapper.FinishContext.EmitCreateCallerID(tb, ilgen);
 			ilgen.Emit(OpCodes.Stloc, callerID);