Imported Upstream version 6.12.0.86

Former-commit-id: 7a84ce7d08c42c458ac8e74b27186ca863315d79
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-07-10 08:44:59 +00:00
parent 92747312ea
commit 0b380204a4
812 changed files with 26901 additions and 9053 deletions

View File

@ -243,6 +243,7 @@ namespace System.Diagnostics {
}
var filename = frame.GetSecureFileName ();
#if !WASM
if (filename[0] == '<') {
var mvid = frame.GetMethod ().Module.ModuleVersionId.ToString ("N");
var aotid = GetAotId ();
@ -252,6 +253,7 @@ namespace System.Diagnostics {
filename = string.Format ("<{0}#{1}>", mvid, aotid);
}
}
#endif
sb.AppendFormat (" in {0}:{1} ", filename, frame.GetFileLineNumber ());
}