Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -50,6 +50,7 @@ namespace System.Diagnostics {
private int ilOffset = OFFSET_UNKNOWN;
private int nativeOffset = OFFSET_UNKNOWN;
private long methodAddress;
private uint methodIndex;
private MethodBase methodBase;
private string fileName;
private int lineNumber;
@@ -59,6 +60,9 @@ namespace System.Diagnostics {
#pragma warning restore 649
#endregion
[MethodImplAttribute (MethodImplOptions.InternalCall)]
extern static int GetILOffsetFromFile (string path, int methodToken, uint methodIndex, int nativeOffset);
[MethodImplAttribute(MethodImplOptions.InternalCall)]
extern static bool get_frame_info (int skip, bool needFileInfo, out MethodBase method,
out int iloffset, out int native_offset,
@@ -171,6 +175,11 @@ namespace System.Diagnostics {
return methodAddress;
}
internal uint GetMethodIndex ()
{
return methodIndex;
}
internal string GetInternalMethodName ()
{
return internalMethodName;