Imported Upstream version 5.8.0.88

Former-commit-id: 4b7216ffda08448e562271ce733688e761120fc5
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-11-28 19:36:51 +00:00
parent 7d05485754
commit 6123a772ed
277 changed files with 4817 additions and 941 deletions

View File

@@ -78,6 +78,7 @@ namespace Mono.Cecil.Mdb {
return null;
var info = new MethodDebugInformation (method);
info.code_size = ReadCodeSize (method);
var scopes = ReadScopes (entry, info);
ReadLineNumbers (entry, info);
@@ -86,6 +87,11 @@ namespace Mono.Cecil.Mdb {
return info;
}
static int ReadCodeSize (MethodDefinition method)
{
return method.Module.Read (method, (m, reader) => reader.ReadCodeSize (m));
}
static void ReadLocalVariables (MethodEntry entry, ScopeDebugInformation [] scopes)
{
var locals = entry.GetLocals ();

View File

@@ -234,7 +234,7 @@ namespace Mono.CompilerServices.SymbolWriter
public override string ToString ()
{
return String.Format ("[Line {0}:{1,2}-{3,4}:{5}]", File, Row, Column, EndRow, EndColumn, Offset);
return String.Format ("[Line {0}:{1},{2}-{3},{4}:{5}]", File, Row, Column, EndRow, EndColumn, Offset);
}
}