Allow runtime internals to reference value types

anydream · anydream · commit c87d233b974a · 2018-01-03T14:41:27.000+08:00
diff --git a/il2cpp/MethodGenerator.cs b/il2cpp/MethodGenerator.cs
@@ -155,8 +155,8 @@ internal class MethodGenerator
 		public const string PrefixVMet = "vmet_";
 		public const string PrefixVFtn = "vftn_";
 
-		private readonly GeneratorContext GenContext;
-		private readonly MethodX CurrMethod;
+		public readonly GeneratorContext GenContext;
+		public readonly MethodX CurrMethod;
 
 		// 类型栈
 		private Stack<StackType> TypeStack = new Stack<StackType>();
@@ -890,7 +890,7 @@ private bool GenerateRuntimeImpl(CodePrinter prt)
 				//	throw new NotImplementedException();
 			}
 			else
-				return RuntimeInternals.GenInternalMethod(CurrMethod, prt, GenContext);
+				return RuntimeInternals.GenInternalMethod(this, prt);
 
 			return false;
 		}
@@ -2996,7 +2996,7 @@ private void RefTypeImpl(TypeX tyX)
 			ImplDepends.Add(GenContext.GetTypeName(tyX));
 		}
 
-		private void RefValueTypeImpl(TypeSig tySig)
+		public void RefValueTypeImpl(TypeSig tySig)
 		{
 			if (tySig.IsValueType)
 				RefTypeImpl(tySig);
diff --git a/il2cpp/RuntimeInternals.cs b/il2cpp/RuntimeInternals.cs
@@ -5,8 +5,11 @@ namespace il2cpp
 {
 	internal static class RuntimeInternals
 	{
-		public static bool GenInternalMethod(MethodX metX, CodePrinter prt, GeneratorContext genContext)
+		public static bool GenInternalMethod(MethodGenerator metGen, CodePrinter prt)
 		{
+			MethodX metX = metGen.CurrMethod;
+			GeneratorContext genContext = metGen.GenContext;
+
 			string typeName = metX.DeclType.GetNameKey();
 			string metName = metX.Def.Name;
 
@@ -98,6 +101,7 @@ public static bool GenInternalMethod(MethodX metX, CodePrinter prt, GeneratorCon
 				}
 				else if (metName == "FastCompareBits")
 				{
+					metGen.RefValueTypeImpl(metX.ParamTypes[0].Next);
 					prt.AppendLine("return IL2CPP_MEMCMP(arg_0, arg_1, sizeof(*arg_0)) == 0 ? 1 : 0;");
 					return true;
 				}

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ internal class MethodGenerator`
`155`	`155`	`public const string PrefixVMet = "vmet_";`
`156`	`156`	`public const string PrefixVFtn = "vftn_";`
`157`	`157`
`158`		`- private readonly GeneratorContext GenContext;`
`159`		`- private readonly MethodX CurrMethod;`
	`158`	`+ public readonly GeneratorContext GenContext;`
	`159`	`+ public readonly MethodX CurrMethod;`
`160`	`160`
`161`	`161`	`// 类型栈`
`162`	`162`	`private Stack<StackType> TypeStack = new Stack<StackType>();`
`@@ -890,7 +890,7 @@ private bool GenerateRuntimeImpl(CodePrinter prt)`
`890`	`890`	`// throw new NotImplementedException();`
`891`	`891`	`}`
`892`	`892`	`else`
`893`		`- return RuntimeInternals.GenInternalMethod(CurrMethod, prt, GenContext);`
	`893`	`+ return RuntimeInternals.GenInternalMethod(this, prt);`
`894`	`894`
`895`	`895`	`return false;`
`896`	`896`	`}`
`@@ -2996,7 +2996,7 @@ private void RefTypeImpl(TypeX tyX)`
`2996`	`2996`	`ImplDepends.Add(GenContext.GetTypeName(tyX));`
`2997`	`2997`	`}`
`2998`	`2998`
`2999`		`- private void RefValueTypeImpl(TypeSig tySig)`
	`2999`	`+ public void RefValueTypeImpl(TypeSig tySig)`
`3000`	`3000`	`{`
`3001`	`3001`	`if (tySig.IsValueType)`
`3002`	`3002`	`RefTypeImpl(tySig);`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,11 @@ namespace il2cpp`
`5`	`5`	`{`
`6`	`6`	`internal static class RuntimeInternals`
`7`	`7`	`{`
`8`		`- public static bool GenInternalMethod(MethodX metX, CodePrinter prt, GeneratorContext genContext)`
	`8`	`+ public static bool GenInternalMethod(MethodGenerator metGen, CodePrinter prt)`
`9`	`9`	`{`
	`10`	`+ MethodX metX = metGen.CurrMethod;`
	`11`	`+ GeneratorContext genContext = metGen.GenContext;`
	`12`	`+`
`10`	`13`	`string typeName = metX.DeclType.GetNameKey();`
`11`	`14`	`string metName = metX.Def.Name;`
`12`	`15`
`@@ -98,6 +101,7 @@ public static bool GenInternalMethod(MethodX metX, CodePrinter prt, GeneratorCon`
`98`	`101`	`}`
`99`	`102`	`else if (metName == "FastCompareBits")`
`100`	`103`	`{`
	`104`	`+ metGen.RefValueTypeImpl(metX.ParamTypes[0].Next);`
`101`	`105`	`prt.AppendLine("return IL2CPP_MEMCMP(arg_0, arg_1, sizeof(*arg_0)) == 0 ? 1 : 0;");`
`102`	`106`	`return true;`
`103`	`107`	`}`