~

anydream · anydream · commit f880b770c7ee · 2018-01-06T13:27:24.000+08:00
diff --git a/il2cpp/Helper.cs b/il2cpp/Helper.cs
@@ -546,6 +546,11 @@ private static void ClassSigName(StringBuilder sb, TypeDef tyDef)
 								fullName);
 		}
 
+		public static bool IsExtern(MethodDef metDef)
+		{
+			return !metDef.HasBody && !metDef.IsAbstract;
+		}
+
 		public static bool IsInstanceField(FieldDef fldDef)
 		{
 			return !fldDef.IsStatic;
diff --git a/il2cpp/MethodGenerator.cs b/il2cpp/MethodGenerator.cs
@@ -2446,7 +2446,9 @@ private void GenNewobj(InstInfo inst, MethodX metX)
 						strAddSize,
 						GenContext.GetTypeID(tyX),
 						GenContext.IsTypeNoRef(tyX) ? "1" : "0",
-						tyX.FinalizerMethod != null ? ", (IL2CPP_FINALIZER_FUNC)&" + GenContext.GetMethodName(tyX.FinalizerMethod, PrefixMet) : null),
+						tyX.FinalizerMethod != null ?
+							", (IL2CPP_FINALIZER_FUNC)&" + GenContext.GetMethodName(tyX.FinalizerMethod, PrefixMet) :
+							null),
 					slotPush.SlotType);
 
 				strCode += '\n' + GenCall(metX, false, ctorArgs);
diff --git a/il2cpp/RuntimeInternals.cs b/il2cpp/RuntimeInternals.cs
@@ -12,6 +12,7 @@ public static bool GenInternalMethod(MethodGenerator metGen, CodePrinter prt)
 
 			string typeName = metX.DeclType.GetNameKey();
 			string metName = metX.Def.Name;
+			string metSigName = metX.GetNameKey();
 
 			if (typeName == "Object")
 			{
@@ -222,14 +223,6 @@ public static bool GenInternalMethod(MethodGenerator metGen, CodePrinter prt)
 					return true;
 				}
 			}
-			else if (typeName == "System.Environment")
-			{
-				if (metName == "GetResourceFromDefault")
-				{
-					prt.AppendLine("return arg_0;");
-					return true;
-				}
-			}
 			else if (typeName == "System.Threading.Monitor")
 			{
 				if (metName == "ReliableEnter")
diff --git a/il2cpp/TypeGenerator.cs b/il2cpp/TypeGenerator.cs
@@ -215,7 +215,7 @@ public CompileUnit Generate()
 				AppendRuntimeFlags(metX, prtDecl);
 
 				prtDecl.AppendFormatLine("// {0}{1}{2} -> {3}",
-					!metX.Def.HasBody && !metX.Def.IsAbstract ? "extern " : null,
+					Helper.IsExtern(metX.Def) ? "extern " : null,
 					metX.Def.IsInternalCall ? "internalcall " : null,
 					Helper.EscapeString(metX.DeclType.GetNameKey()),
 					Helper.EscapeString(metX.GetReplacedNameKey()));

Original file line number	Diff line number	Diff line change
`@@ -546,6 +546,11 @@ private static void ClassSigName(StringBuilder sb, TypeDef tyDef)`
`546`	`546`	`fullName);`
`547`	`547`	`}`
`548`	`548`
	`549`	`+ public static bool IsExtern(MethodDef metDef)`
	`550`	`+ {`
	`551`	`+ return !metDef.HasBody && !metDef.IsAbstract;`
	`552`	`+ }`
	`553`	`+`
`549`	`554`	`public static bool IsInstanceField(FieldDef fldDef)`
`550`	`555`	`{`
`551`	`556`	`return !fldDef.IsStatic;`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public static bool GenInternalMethod(MethodGenerator metGen, CodePrinter prt)`
`12`	`12`
`13`	`13`	`string typeName = metX.DeclType.GetNameKey();`
`14`	`14`	`string metName = metX.Def.Name;`
	`15`	`+ string metSigName = metX.GetNameKey();`
`15`	`16`
`16`	`17`	`if (typeName == "Object")`
`17`	`18`	`{`
`@@ -222,14 +223,6 @@ public static bool GenInternalMethod(MethodGenerator metGen, CodePrinter prt)`
`222`	`223`	`return true;`
`223`	`224`	`}`
`224`	`225`	`}`
`225`		`- else if (typeName == "System.Environment")`
`226`		`- {`
`227`		`- if (metName == "GetResourceFromDefault")`
`228`		`- {`
`229`		`- prt.AppendLine("return arg_0;");`
`230`		`- return true;`
`231`		`- }`
`232`		`- }`
`233`	`226`	`else if (typeName == "System.Threading.Monitor")`
`234`	`227`	`{`
`235`	`228`	`if (metName == "ReliableEnter")`