Prettify castclass generated code

anydream · anydream · commit ee66a126bdb8 · 2018-01-06T22:59:08.000+08:00
diff --git a/il2cpp/MethodGenerator.cs b/il2cpp/MethodGenerator.cs
@@ -2693,15 +2693,24 @@ private void GenCastclass(InstInfo inst, TypeX tyX)
 
 			RefTypeImpl(tyX);
 
-			inst.InstCode = string.Format(
-				"if ({0} == nullptr || {1}({0}->TypeID)) {2}\n" +
-				"else IL2CPP_THROW_INVALIDCAST;",
+			CodePrinter prt = new CodePrinter();
+			prt.AppendFormatLine("if ({0} == nullptr || {1}({0}->TypeID))",
 				TempName(slotPop),
-				GenContext.GetIsTypeFuncName(tyX),
+				GenContext.GetIsTypeFuncName(tyX));
+			++prt.Indents;
+			prt.AppendLine(
 				GenAssign(
 					TempName(slotPush),
 					TempName(slotPop),
 					slotPush.SlotType));
+			--prt.Indents;
+
+			prt.AppendLine("else");
+			++prt.Indents;
+			prt.Append("IL2CPP_THROW_INVALIDCAST;");
+			--prt.Indents;
+
+			inst.InstCode = prt.ToString();
 		}
 
 		private void GenLdfld(InstInfo inst, FieldX fldX, bool isAddr = false)
