Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -109,7 +109,7 @@ namespace Mono.Cecil.Cil {
switch (opcode.OperandType) {
case OperandType.ShortInlineBrTarget:
case OperandType.InlineBrTarget:
AppendLabel (instruction, operand);
AppendLabel (instruction, (Instruction) operand);
break;
case OperandType.InlineSwitch:
var labels = (Instruction []) operand;
@@ -133,15 +133,10 @@ namespace Mono.Cecil.Cil {
return instruction.ToString ();
}
static void AppendLabel (StringBuilder builder, object o)
static void AppendLabel (StringBuilder builder, Instruction instruction)
{
builder.Append ("IL_");
if (o is Instruction)
builder.Append ((o as Instruction).offset.ToString ("x4"));
else if (o is int) {
builder.Append (((int)o).ToString ("x4"));
builder.Append (" (invalid)");
}
builder.Append (instruction.offset.ToString ("x4"));
}
public static Instruction Create (OpCode opcode)