From 06bef669c52cc86c57bfe6f2bfe091c924780622 Mon Sep 17 00:00:00 2001
From: de4dot <de4dot@gmail.com>
Date: Sat, 28 Sep 2013 14:54:00 +0200
Subject: [PATCH] Inline a few more instructions

---
 blocks/cflow/MethodCallInlinerBase.cs | 30 +++++++++++++++++++--------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/blocks/cflow/MethodCallInlinerBase.cs b/blocks/cflow/MethodCallInlinerBase.cs
index 873c4d62..d8ed9247 100644
--- a/blocks/cflow/MethodCallInlinerBase.cs
+++ b/blocks/cflow/MethodCallInlinerBase.cs
@@ -142,7 +142,9 @@ namespace de4dot.blocks.cflow {
 			if (instr == null || loadIndex != methodArgsCount - popLastArgs)
 				return null;
 
-			if (instr.OpCode.Code == Code.Call || instr.OpCode.Code == Code.Callvirt) {
+			switch (instr.OpCode.Code) {
+			case Code.Call:
+			case Code.Callvirt:
 				if (foundLdarga)
 					return null;
 				var callInstr = instr;
@@ -160,8 +162,8 @@ namespace de4dot.blocks.cflow {
 					return null;
 
 				return new InstructionPatcher(patchIndex, instrIndex, callInstr);
-			}
-			else if (instr.OpCode.Code == Code.Newobj) {
+
+			case Code.Newobj:
 				if (foundLdarga)
 					return null;
 				var newobjInstr = instr;
@@ -185,20 +187,30 @@ namespace de4dot.blocks.cflow {
 					return null;
 
 				return new InstructionPatcher(patchIndex, instrIndex, newobjInstr);
-			}
-			else if (instr.OpCode.Code == Code.Ldfld || instr.OpCode.Code == Code.Ldflda ||
-					instr.OpCode.Code == Code.Ldftn || instr.OpCode.Code == Code.Ldvirtftn) {
+
+			case Code.Ldfld:
+			case Code.Ldflda:
+			case Code.Ldftn:
+			case Code.Ldvirtftn:
+			case Code.Ldlen:
+			case Code.Initobj:
+			case Code.Isinst:
+			case Code.Castclass:
+			case Code.Newarr:
+			case Code.Ldtoken:
+			case Code.Unbox_Any:
 				var ldInstr = instr;
 				if (methodArgsCount != 1)
 					return null;
 
-				if (!HasAccessTo(instr.Operand))
+				if (instr.OpCode.OperandType != OperandType.InlineNone && !HasAccessTo(instr.Operand))
 					return null;
 
 				return new InstructionPatcher(patchIndex, instrIndex, ldInstr);
-			}
 
-			return null;
+			default:
+				return null;
+			}
 		}
 
 		bool HasAccessTo(object operand) {