Browse Source

Fix build.

pull/1030/head
Siegfried Pammer 8 years ago
parent
commit
68123fc6b3
  1. 2
      ICSharpCode.Decompiler/Disassembler/MethodBodyDisassembler.cs
  2. 2
      ICSharpCode.Decompiler/IL/Transforms/TransformArrayInitializers.cs

2
ICSharpCode.Decompiler/Disassembler/MethodBodyDisassembler.cs

@ -275,7 +275,7 @@ namespace ICSharpCode.Decompiler.Disassembler
output.WriteLine("} // end filter"); output.WriteLine("} // end filter");
break; break;
default: default:
throw new NotSupportedException(); throw new ArgumentOutOfRangeException();
} }
} }

2
ICSharpCode.Decompiler/IL/Transforms/TransformArrayInitializers.cs

@ -337,7 +337,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
if (MatchInitializeArrayCall(body.Instructions[pos], out var method, out var v2, out var field) && array == v2) { if (MatchInitializeArrayCall(body.Instructions[pos], out var method, out var v2, out var field) && array == v2) {
if (field.HasFlag(System.Reflection.FieldAttributes.HasFieldRVA)) { if (field.HasFlag(System.Reflection.FieldAttributes.HasFieldRVA)) {
var valuesList = new List<ILInstruction>(); var valuesList = new List<ILInstruction>();
var initialValue = field.GetInitialValue(context.TypeSystem.ModuleDefinition.Reader); var initialValue = field.GetInitialValue(context.TypeSystem.ModuleDefinition.Reader, context.TypeSystem);
if (DecodeArrayInitializer(arrayType, array, initialValue, arrayLength, valuesList)) { if (DecodeArrayInitializer(arrayType, array, initialValue, arrayLength, valuesList)) {
values = valuesList.ToArray(); values = valuesList.ToArray();
foundPos = pos; foundPos = pos;

Loading…
Cancel
Save