Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -995,19 +995,7 @@ namespace Mono.Cecil {
public ImageDebugHeader GetDebugHeader ()
{
if (!HasDebugHeader)
throw new InvalidOperationException ();
return Image.DebugHeader;
}
void ProcessDebugHeader ()
{
if (!HasDebugHeader)
return;
if (!symbol_reader.ProcessDebugHeader (GetDebugHeader ()))
throw new InvalidOperationException ();
return Image.DebugHeader ?? new ImageDebugHeader ();
}
#if !READ_ONLY
@ -1084,7 +1072,10 @@ namespace Mono.Cecil {
symbol_reader = reader;
ProcessDebugHeader ();
if (!symbol_reader.ProcessDebugHeader (GetDebugHeader ())) {
symbol_reader = null;
throw new InvalidOperationException ();
}
if (HasImage && ReadingMode == ReadingMode.Immediate) {
var immediate_reader = new ImmediateModuleReader (Image);
@ -1135,7 +1126,7 @@ namespace Mono.Cecil {
Mixin.CheckStream (stream);
Mixin.CheckReadSeek (stream);
return ReadModule (Disposable.NotOwned (stream), "", parameters);
return ReadModule (Disposable.NotOwned (stream), stream.GetFileName (), parameters);
}
static ModuleDefinition ReadModule (Disposable<Stream> stream, string fileName, ReaderParameters parameters)