InitObj is no longer a basic operation.

Backend/Transformations/Disassembler.cs

@@ -110,7 +110,10 @@ public InstructionTranslator(OperandStack stack, MethodBody body, IType returnTy
 				this.body = body;				
 				this.returnType = returnType;
 			}
-
+			public override void Visit(Bytecode.InitObjInstruction op)
+			{
+				ProcessInitializeObject(op);
+			}
 			public override void Visit(Bytecode.BasicInstruction op)
 			{
 				switch (op.Operation)
@@ -172,10 +175,6 @@ public override void Visit(Bytecode.BasicInstruction op)
 						ProcessInitializeMemory(op);
 						break;
 
-					case Bytecode.BasicOperation.InitObject:
-						ProcessInitializeObject(op);
-						break;
-
 					case Bytecode.BasicOperation.CopyObject:
 						ProcessCopyObject(op);
 						break;
@@ -328,7 +327,7 @@ private void ProcessInitializeMemory(Bytecode.BasicInstruction op)
 				body.Instructions.Add(instruction);
 			}
 
-			private void ProcessInitializeObject(Bytecode.BasicInstruction op)
+			private void ProcessInitializeObject(Bytecode.InitObjInstruction op)
 			{
 				var targetAddress = stack.Pop();
 				var instruction = new Tac.InitializeObjectInstruction(op.Offset, targetAddress);

CCIProvider/CodeProvider.cs

@@ -329,7 +329,7 @@ private IInstruction ExtractInstruction(Cci.IOperation operation)
 					break;
 
 				case Cci.OperationCode.Initobj:
-					instruction = ProcessBasic(operation);
+					instruction = ProcessInitObj(operation);
 					break;
 
 				case Cci.OperationCode.Ldarg:
@@ -751,7 +751,12 @@ private IInstruction ProcessStoreField(Cci.IOperation op)
 			var instruction = new StoreFieldInstruction(op.Offset, ourField);
 			return instruction;
 		}
-
+		private IInstruction ProcessInitObj(Cci.IOperation op)
+		{
+			var type = typeExtractor.ExtractType(op.Value as Cci.ITypeReference);
+			var instruction = new InitObjInstruction(op.Offset, type);
+			return instruction;
+		}
 		private IInstruction ProcessBasic(Cci.IOperation op)
 		{
 			var operation = OperationHelper.ToBasicOperation(op.OperationCode);

CCIProvider/OperationHelper.cs

@@ -52,7 +52,6 @@ public static BasicOperation ToBasicOperation(Cci.OperationCode opcode)
 				case Cci.OperationCode.Dup:			return BasicOperation.Dup;
 				case Cci.OperationCode.Localloc:	return BasicOperation.LocalAllocation;
 				case Cci.OperationCode.Initblk:		return BasicOperation.InitBlock;
-				case Cci.OperationCode.Initobj:		return BasicOperation.InitObject;
 				case Cci.OperationCode.Cpblk:		return BasicOperation.CopyBlock;
 				case Cci.OperationCode.Cpobj:		return BasicOperation.CopyObject;
 				case Cci.OperationCode.Ret:			return BasicOperation.Return;

MetadataProvider/AssemblyExtractor.cs

@@ -938,7 +938,7 @@ private IInstruction ExtractInstruction(ILInstruction operation)
 					break;
 
 				case SRM.ILOpCode.Initobj:
-					instruction = ProcessBasic(operation);
+					instruction = ProcessInitObj(operation);
 					break;
 
 				case SRM.ILOpCode.Ldarg:
@@ -1615,7 +1615,12 @@ private IInstruction ProcessStoreField(ILInstruction op)
 			var instruction = new StoreFieldInstruction(op.Offset, field);
 			return instruction;
 		}
-
+		private IInstruction ProcessInitObj(ILInstruction op)
+		{
+			var type = GetOperand<IType>(op);
+			var instruction = new InitObjInstruction(op.Offset, type);
+			return instruction;
+		}
 		private IInstruction ProcessBasic(ILInstruction op)
 		{
 			var operation = OperationHelper.ToBasicOperation(op.Opcode);

MetadataProvider/OperationHelper.cs

@@ -52,7 +52,6 @@ public static BasicOperation ToBasicOperation(SRM.ILOpCode opcode)
 				case SRM.ILOpCode.Dup:			return BasicOperation.Dup;
 				case SRM.ILOpCode.Localloc:		return BasicOperation.LocalAllocation;
 				case SRM.ILOpCode.Initblk:		return BasicOperation.InitBlock;
-				case SRM.ILOpCode.Initobj:		return BasicOperation.InitObject;
 				case SRM.ILOpCode.Cpblk:		return BasicOperation.CopyBlock;
 				case SRM.ILOpCode.Cpobj:		return BasicOperation.CopyObject;
 				case SRM.ILOpCode.Ret:			return BasicOperation.Return;

Model/Bytecode/Instructions.cs

@@ -36,7 +36,6 @@ public enum BasicOperation
 		EndFilter,
 		LocalAllocation,
 		InitBlock,
-		InitObject,
 		CopyObject,
 		CopyBlock,
 		LoadArrayLength,
@@ -167,7 +166,27 @@ protected string ToString(object argument)
 			return this.ToString("{0}", argument);
 		}
 	}
+	public class InitObjInstruction : Instruction
+	{
+		public IType Type { get; }
+
+		public InitObjInstruction(uint label, IType type)
+		: base(label)
+		{
+			this.Type = type;
+		}
 
+		public override void Accept(IInstructionVisitor visitor)
+		{
+			base.Accept(visitor);
+			visitor.Visit(this);
+		}
+
+		public override string ToString()
+		{
+			return "init obj of type " + Type.ToString();
+		}
+	}
 	public class BasicInstruction : Instruction
 	{
 		public BasicOperation Operation { get; set; }

Model/Bytecode/Visitor/IInstructionVisitor.cs

@@ -11,6 +11,7 @@ public interface IInstructionVisitor
 	{
 		void Visit(IInstructionContainer container);
 		void Visit(Instruction instruction);
+		void Visit(InitObjInstruction instruction);
 		void Visit(BasicInstruction instruction);
 		void Visit(LoadInstruction instruction);
 		void Visit(LoadFieldInstruction instruction);

Model/Bytecode/Visitor/InstructionVisitor.cs

@@ -19,6 +19,7 @@ public virtual void Visit(IInstructionContainer container)
 		}
 
 		public virtual void Visit(Instruction instruction) { }
+		public virtual void Visit(InitObjInstruction instruction) { }
 		public virtual void Visit(BasicInstruction instruction) { }
 		public virtual void Visit(LoadInstruction instruction) { }
 		public virtual void Visit(LoadFieldInstruction instruction) { }