Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

external/ikvm/ikvmc/remapper.cs

@@ -829,9 +829,7 @@ namespace IKVM.Internal.MapXml
 
 		internal override void Generate(CodeGenContext context, CodeEmitter ilgen)
 		{
-			FieldWrapper fw = StaticCompiler.GetClassForMapXml(context.ClassLoader, Class).GetFieldWrapper(Name, Sig);
-			fw.Link();
-			ilgen.Emit(OpCodes.Ldflda, fw.GetField());
+			ilgen.Emit(OpCodes.Ldflda, StaticCompiler.GetFieldForMapXml(context.ClassLoader, Class, Name, Sig).GetField());
 		}
 	}
 
@@ -847,10 +845,8 @@ namespace IKVM.Internal.MapXml
 
 		internal override void Generate(CodeGenContext context, CodeEmitter ilgen)
 		{
-			FieldWrapper fw = StaticCompiler.GetClassForMapXml(context.ClassLoader, Class).GetFieldWrapper(Name, Sig);
-			fw.Link();
 			// we don't use fw.EmitGet because we don't want automatic unboxing and whatever
-			ilgen.Emit(OpCodes.Ldfld, fw.GetField());
+			ilgen.Emit(OpCodes.Ldfld, StaticCompiler.GetFieldForMapXml(context.ClassLoader, Class, Name, Sig).GetField());
 		}
 	}
 
@@ -874,10 +870,8 @@ namespace IKVM.Internal.MapXml
 			}
 			else
 			{
-				FieldWrapper fw = StaticCompiler.GetClassForMapXml(context.ClassLoader, Class).GetFieldWrapper(Name, Sig);
-				fw.Link();
 				// we don't use fw.EmitGet because we don't want automatic unboxing and whatever
-				ilgen.Emit(OpCodes.Ldsfld, fw.GetField());
+				ilgen.Emit(OpCodes.Ldsfld, StaticCompiler.GetFieldForMapXml(context.ClassLoader, Class, Name, Sig).GetField());
 			}
 		}
 	}
@@ -894,10 +888,8 @@ namespace IKVM.Internal.MapXml
 
 		internal override void Generate(CodeGenContext context, CodeEmitter ilgen)
 		{
-			FieldWrapper fw = StaticCompiler.GetClassForMapXml(context.ClassLoader, Class).GetFieldWrapper(Name, Sig);
-			fw.Link();
 			// we don't use fw.EmitSet because we don't want automatic unboxing and whatever
-			ilgen.Emit(OpCodes.Stfld, fw.GetField());
+			ilgen.Emit(OpCodes.Stfld, StaticCompiler.GetFieldForMapXml(context.ClassLoader, Class, Name, Sig).GetField());
 		}
 	}
 
@@ -913,10 +905,8 @@ namespace IKVM.Internal.MapXml
 
 		internal override void Generate(CodeGenContext context, CodeEmitter ilgen)
 		{
-			FieldWrapper fw = StaticCompiler.GetClassForMapXml(context.ClassLoader, Class).GetFieldWrapper(Name, Sig);
-			fw.Link();
 			// we don't use fw.EmitSet because we don't want automatic unboxing and whatever
-			ilgen.Emit(OpCodes.Stsfld, fw.GetField());
+			ilgen.Emit(OpCodes.Stsfld, StaticCompiler.GetFieldForMapXml(context.ClassLoader, Class, Name, Sig).GetField());
 		}
 	}
 
@@ -1061,6 +1051,24 @@ namespace IKVM.Internal.MapXml
 		}
 	}
 
+	[XmlType("div_un")]
+	public sealed class Div_Un : Simple
+	{
+		public Div_Un()
+			: base(OpCodes.Div_Un)
+		{
+		}
+	}
+
+	[XmlType("rem_un")]
+	public sealed class Rem_Un : Simple
+	{
+		public Rem_Un()
+			: base(OpCodes.Rem_Un)
+		{
+		}
+	}
+
 	[XmlType("and")]
 	public sealed class And : Simple
 	{
@@ -1459,6 +1467,8 @@ namespace IKVM.Internal.MapXml
 		[XmlElement(typeof(Add))]
 		[XmlElement(typeof(Sub))]
 		[XmlElement(typeof(Mul))]
+		[XmlElement(typeof(Div_Un))]
+		[XmlElement(typeof(Rem_Un))]
 		[XmlElement(typeof(And))]
 		[XmlElement(typeof(Or))]
 		[XmlElement(typeof(Xor))]