Imported Upstream version 5.20.0.208

Former-commit-id: 8fbf7dae6cd486bffb1fa6a52020e8eb23c570b1
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-13 08:25:33 +00:00
parent 5d930a31c6
commit 219eec173f
74 changed files with 391 additions and 163 deletions

View File

@@ -183,12 +183,12 @@ namespace Mono.Cecil.Pdb {
parent.variables = new Collection<VariableDebugInformation> (scope.slots.Length);
foreach (PdbSlot slot in scope.slots) {
if (slot.flags == 1) // parameter names
if ((slot.flags & 1) != 0) // parameter names
continue;
var index = (int) slot.slot;
var variable = new VariableDebugInformation (index, slot.name);
if (slot.flags == 4)
if ((slot.flags & 4) != 0)
variable.IsDebuggerHidden = true;
parent.variables.Add (variable);
}

View File

@@ -22,18 +22,18 @@ using Mono.Collections.Generic;
namespace Mono.Cecil.Pdb {
public class NativePdbWriter : ISymbolWriter, IMetadataSymbolWriter {
public class NativePdbWriter : ISymbolWriter {
readonly ModuleDefinition module;
readonly MetadataBuilder metadata;
readonly SymWriter writer;
readonly Dictionary<string, SymDocumentWriter> documents;
readonly Dictionary<ImportDebugInformation, MetadataToken> import_info_to_parent;
MetadataBuilder metadata;
internal NativePdbWriter (ModuleDefinition module, SymWriter writer)
{
this.module = module;
this.metadata = module.metadata_builder;
this.writer = writer;
this.documents = new Dictionary<string, SymDocumentWriter> ();
this.import_info_to_parent = new Dictionary<ImportDebugInformation, MetadataToken> ();
@@ -75,15 +75,6 @@ namespace Mono.Cecil.Pdb {
writer.CloseMethod ();
}
void IMetadataSymbolWriter.SetMetadata (MetadataBuilder metadata)
{
this.metadata = metadata;
}
void IMetadataSymbolWriter.WriteModule ()
{
}
void DefineCustomMetadata (MethodDebugInformation info, MetadataToken import_parent)
{
var metadata = new CustomMetadataWriter (this.writer);