mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mcs/class/corlib/System.Diagnostics/StackFrame.cs
View File

@@ -71,22 +71,25 @@ namespace System.Diagnostics {
out nativeOffset, out fileName, out lineNumber,
out columnNumber);
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public StackFrame (bool fNeedFileInfo)
{
get_frame_info (2, fNeedFileInfo, out methodBase, out ilOffset,
out nativeOffset, out fileName, out lineNumber,
out columnNumber);
}
public StackFrame (int skipFrames)
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public StackFrame (int skipFrames)
{
get_frame_info (skipFrames + 2, false, out methodBase, out ilOffset,
out nativeOffset, out fileName, out lineNumber,
out columnNumber);
}
public StackFrame (int skipFrames, bool fNeedFileInfo)
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public StackFrame (int skipFrames, bool fNeedFileInfo)
{
get_frame_info (skipFrames + 2, fNeedFileInfo, out methodBase, out ilOffset,
out nativeOffset, out fileName, out lineNumber,
@@ -95,7 +98,8 @@ namespace System.Diagnostics {
// LAMESPEC: According to the MSDN docs, this creates a frame with _only_
// the filename and lineNumber, but MS fills out the frame info as well.
public StackFrame (string fileName, int lineNumber)
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public StackFrame (string fileName, int lineNumber)
{
get_frame_info (2, false, out methodBase, out ilOffset,
out nativeOffset, out fileName, out lineNumber,
@@ -107,7 +111,8 @@ namespace System.Diagnostics {
// LAMESPEC: According to the MSDN docs, this creates a frame with _only_
// the filename, lineNumber and colNumber, but MS fills out the frame info as well.
public StackFrame (string fileName, int lineNumber, int colNumber)
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public StackFrame (string fileName, int lineNumber, int colNumber)
{
get_frame_info (2, false, out methodBase, out ilOffset,
out nativeOffset, out fileName, out lineNumber,
@@ -129,7 +134,7 @@ namespace System.Diagnostics {
public virtual string GetFileName()
{
#if !NET_2_1
#if !MOBILE
if (SecurityManager.SecurityEnabled && (fileName != null) && (fileName.Length > 0)) {
string fn = Path.GetFullPath (fileName);
new FileIOPermission (FileIOPermissionAccess.PathDiscovery, fn).Demand ();

4
mcs/class/corlib/System.Diagnostics/StackTrace.cs
View File

@@ -69,21 +69,25 @@ namespace System.Diagnostics {
init_frames (METHODS_TO_SKIP, false);
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public StackTrace (bool fNeedFileInfo)
{
init_frames (METHODS_TO_SKIP, fNeedFileInfo);
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public StackTrace (int skipFrames)
{
init_frames (skipFrames, false);
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public StackTrace (int skipFrames, bool fNeedFileInfo)
{
init_frames (skipFrames, fNeedFileInfo);
}
[MethodImplAttribute (MethodImplOptions.NoInlining)]
void init_frames (int skipFrames, bool fNeedFileInfo)
{
if (skipFrames < 0)