Imported Upstream version 4.6.0.150

Former-commit-id: 73e3bb1e96dd09dc931c1dfe559d2c7f7b8b02c7
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-23 13:20:38 +00:00
parent 02ac915603
commit b95516a3dd
239 changed files with 4096 additions and 1544 deletions

View File

@ -19,18 +19,18 @@ namespace Mono
this.logger = logger;
}
internal bool TryResolveLocation (StackFrameData sfData, string mvid, string aotid)
internal bool TryResolveLocation (StackFrameData sfData)
{
if (mvid == null)
if (sfData.Mvid == null)
return false;
var assemblyLocProvider = GetOrCreateAssemblyLocationProvider (mvid);
var assemblyLocProvider = GetOrCreateAssemblyLocationProvider (sfData.Mvid);
if (assemblyLocProvider == null)
return false;
SeqPointInfo seqPointInfo = null;
if (!sfData.IsILOffset && aotid != null)
seqPointInfo = GetOrCreateSeqPointInfo (aotid);
if (!sfData.IsILOffset && sfData.Aotid != null)
seqPointInfo = GetOrCreateSeqPointInfo (sfData.Aotid);
return assemblyLocProvider.TryResolveLocation (sfData, seqPointInfo);
}