pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Extended testing of non user code stepping; 

Mark generated constructors as non user code;  
Fake JMC during StepOut

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3207 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 17 years ago
parent
9fae8aee0d
commit
40696330b0
8 changed files with 148 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs
  2. 4
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs
  3. 13
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/SourcecodeSegment.cs
  4. 13
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs
  5. 9
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MethodInfo.cs
  6. 81
      src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebuggerAttributes.cs
  7. 8
      src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs
  8. 12
      src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs

30
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs
Unescape View File

@ -7,11 +7,11 @@ @@ -7,11 +7,11 @@
using System;
using System.Collections.Generic;
using Debugger.MetaData;
using Debugger.Wrappers.CorDebug;
using Debugger.Wrappers.CorSym;
using Debugger.Wrappers.MetaData;
using System.Runtime.InteropServices;
namespace Debugger
{
@ -189,6 +189,7 @@ namespace Debugger @@ -189,6 +189,7 @@ namespace Debugger
/// </summary>
public void SetJustMyCodeStatus(bool isMyCode, bool obeyAttributes)
{
DateTime start = Util.HighPrecisionTimer.Now;
uint unused = 0;
if (isMyCode) {
corModule.CastTo<ICorDebugModule2>().SetJMCStatus(1, 0, ref unused);
@ -214,9 +215,36 @@ namespace Debugger @@ -214,9 +215,36 @@ namespace Debugger
}
}
}
// Mark generated constructors as non-user code
if (this.HasSymbols) {
foreach(TypeDefProps typeDef in metaData.EnumTypeDefProps()) {
foreach(MethodProps methodDef in metaData.EnumMethodPropsWithName(typeDef.Token, ".ctor")) {
try {
this.SymReader.GetMethod(methodDef.Token);
} catch (COMException) {
// Symbols not found
ICorDebugFunction2 corFunction = corModule.GetFunctionFromToken(methodDef.Token).CastTo<ICorDebugFunction2>();
corFunction.SetJMCStatus(0 /* false */);
this.Process.TraceMessage("Constructor of {0} marked as non-user code", metaData.GetTypeDefProps(methodDef.ClassToken).Name);
}
}
foreach(MethodProps methodDef in metaData.EnumMethodPropsWithName(typeDef.Token, ".cctor")) {
try {
this.SymReader.GetMethod(methodDef.Token);
} catch (COMException) {
// Symbols not found
ICorDebugFunction2 corFunction = corModule.GetFunctionFromToken(methodDef.Token).CastTo<ICorDebugFunction2>();
corFunction.SetJMCStatus(0 /* false */);
this.Process.TraceMessage("Static constructor of {0} marked as non-user code", metaData.GetTypeDefProps(methodDef.ClassToken).Name);
}
}
}
}
} else {
corModule.CastTo<ICorDebugModule2>().SetJMCStatus(0, 0, ref unused);
}
DateTime end = Util.HighPrecisionTimer.Now;
this.Process.TraceMessage("Set Just-My-Code for module \"{0}\" ({1} ms)", this.Filename, (end - start).TotalMilliseconds);
}
public void ApplyChanges(byte[] metadata, byte[] il)

4
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs
Unescape View File

@ -143,7 +143,9 @@ namespace Debugger @@ -143,7 +143,9 @@ namespace Debugger
}
/// <summary> Returns value representing the System.Threading.Thread object </summary>
/// <remarks> The value is null while the thread is being created (the CreateThread callback). </remarks>
/// <remarks> The value is null while the thread is being created (the CreateThread callback) and
/// it may stay null during the run of the program. (probaly until the debuggee accesses
/// the System.Threading.Thread object which forces the creation)</remarks>
public Value RuntimeValue {
get {
process.AssertPaused();

13
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/SourcecodeSegment.cs
Unescape View File

@ -7,9 +7,11 @@ @@ -7,9 +7,11 @@
using System;
using System.Collections.Generic;
using System.IO;
using Debugger.Wrappers.CorDebug;
using Debugger.Wrappers.CorSym;
using System.IO;
using System.Runtime.InteropServices;
namespace Debugger
{
@ -235,7 +237,14 @@ namespace Debugger @@ -235,7 +237,14 @@ namespace Debugger
ISymUnmanagedReader symReader = module.SymReader;
if (symReader == null) return null; // No symbols
ISymUnmanagedMethod symMethod = symReader.GetMethod(corFunction.Token);
ISymUnmanagedMethod symMethod;
try {
symMethod = symReader.GetMethod(corFunction.Token);
} catch (COMException) {
// Can not find the method
// eg. Compiler generated constructors are not in symbol store
return null;
}
if (symMethod == null) return null;
uint sequencePointCount = symMethod.SequencePointCount;

13
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs
Unescape View File

@ -129,7 +129,15 @@ namespace Debugger @@ -129,7 +129,15 @@ namespace Debugger
if (stepper.PauseWhenComplete) {
if (process.SelectedThread.MostRecentStackFrame.HasSymbols) {
pauseOnNextExit = true;
// JMC is ignored by the API during StepOut - Compensate
if (process.Debugger.JustMyCodeEnabled &&
stepper.Operation == Stepper.StepperOperation.StepOut &&
!process.SelectedThread.MostRecentStackFrame.MethodInfo.IsMyCode) {
process.TraceMessage(" - stepping out non-user code at " + process.SelectedThread.MostRecentStackFrame.ToString());
new Stepper(process.SelectedThread.MostRecentStackFrame, "Stepper out of non-user code").StepOut();
} else {
pauseOnNextExit = true;
}
} else {
// This can only happen when JMC is disabled (ie NET1.1 or StepOut)
if (stepper.Operation == Stepper.StepperOperation.StepOut) {
@ -137,8 +145,9 @@ namespace Debugger @@ -137,8 +145,9 @@ namespace Debugger
process.TraceMessage(" - stepping out of code without symbols at " + process.SelectedThread.MostRecentStackFrame.ToString());
new Stepper(process.SelectedThread.MostRecentStackFrame, "Stepper out of code without symbols").StepOut();
} else {
// NET1.1: There is extra step over stepper, just keep going
// JMC is disabled: There is extra step over stepper, we could just keep going
process.TraceMessage(" - leaving code without symbols");
new Stepper(process.SelectedThread.MostRecentStackFrame, "Stepper out of code without symbols").StepOut();
}
}
}

9
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/MethodInfo.cs
Unescape View File

@ -83,6 +83,15 @@ namespace Debugger.MetaData @@ -83,6 +83,15 @@ namespace Debugger.MetaData
}
}
public bool IsMyCode {
get {
return this.CorFunction.CastTo<ICorDebugFunction2>().JMCStatus != 0;
}
set {
this.CorFunction.CastTo<ICorDebugFunction2>().SetJMCStatus(value ? 1 : 0);
}
}
internal MethodInfo(DebugType declaringType, MethodProps methodProps):base (declaringType)
{
this.methodProps = methodProps;

81
src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebuggerAttributes.cs
Unescape View File

@ -14,17 +14,27 @@ namespace Debugger.Tests.TestPrograms @@ -14,17 +14,27 @@ namespace Debugger.Tests.TestPrograms
{
public static void Main()
{
System.Diagnostics.Debug.WriteLine("Start");
System.Diagnostics.Debugger.Break();
Internal();
IgnoredClass.Internal();
System.Diagnostics.Debug.WriteLine("End");
StepOut1();
IgnoredClass.Internal_Pass();
new DefaultCtorClass().Target();
}
[DebuggerStepThrough]
static void StepOut1()
{
StepOut2();
}
static void StepOut2()
{
}
[DebuggerStepThrough]
static void Internal()
{
System.Diagnostics.Debug.WriteLine("Internal");
}
[DebuggerNonUserCode]
@ -32,7 +42,26 @@ namespace Debugger.Tests.TestPrograms @@ -32,7 +42,26 @@ namespace Debugger.Tests.TestPrograms
{
public static void Internal()
{
System.Diagnostics.Debug.WriteLine("Internal");
}
public static void Internal_Pass()
{
NotIgnoredClass.Target();
}
}
public class NotIgnoredClass
{
public static void Target()
{
}
}
public class DefaultCtorClass
{
public void Target()
{
}
}
}
@ -51,11 +80,29 @@ namespace Debugger.Tests { @@ -51,11 +80,29 @@ namespace Debugger.Tests {
{
StartTest("DebuggerAttributes.cs");
process.SelectedStackFrame.StepInto();
process.SelectedStackFrame.StepInto();
Assert.AreEqual(process.SelectedStackFrame.MethodInfo.Name, "Main");
process.SelectedStackFrame.StepInto();
Assert.AreEqual(process.SelectedStackFrame.MethodInfo.Name, "Main");
process.SelectedStackFrame.StepInto(); // Break command
process.SelectedStackFrame.StepInto(); // Internal
Assert.AreEqual("Main", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepInto(); // IgnoredClass.Internal
Assert.AreEqual("Main", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepInto(); // StepOut1
Assert.AreEqual("StepOut2", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepOut();
Assert.AreEqual("Main", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepOver(); // Finish the step out
Assert.AreEqual("Main", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepInto(); // IgnoredClass.Internal_Pass
Assert.AreEqual("Target", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepOut();
Assert.AreEqual("Main", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepOver(); // Finish the step out
Assert.AreEqual("Main", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepInto(); // Generated default constructor
Assert.AreEqual("Target", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepOut();
Assert.AreEqual("Main", process.SelectedStackFrame.MethodInfo.Name);
process.SelectedStackFrame.StepOver(); // Finish the step out
Assert.AreEqual("Main", process.SelectedStackFrame.MethodInfo.Name);
EndTest();
}
@ -71,17 +118,19 @@ namespace Debugger.Tests { @@ -71,17 +118,19 @@ namespace Debugger.Tests {
<ProcessStarted />
<ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
<ModuleLoaded>DebuggerAttributes.exe (Has symbols)</ModuleLoaded>
<ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
<ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
<ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
<LogMessage>Start\r\n</LogMessage>
<DebuggingPaused>Break</DebuggingPaused>
<DebuggingPaused>StepComplete</DebuggingPaused>
<LogMessage>Internal\r\n</LogMessage>
<DebuggingPaused>StepComplete</DebuggingPaused>
<LogMessage>Internal\r\n</LogMessage>
<DebuggingPaused>StepComplete</DebuggingPaused>
<LogMessage>End\r\n</LogMessage>
<DebuggingPaused>StepComplete</DebuggingPaused>
<DebuggingPaused>StepComplete</DebuggingPaused>
<DebuggingPaused>StepComplete</DebuggingPaused>
<DebuggingPaused>StepComplete</DebuggingPaused>
<DebuggingPaused>StepComplete</DebuggingPaused>
<DebuggingPaused>StepComplete</DebuggingPaused>
<DebuggingPaused>StepComplete</DebuggingPaused>
<DebuggingPaused>StepComplete</DebuggingPaused>
<DebuggingPaused>StepComplete</DebuggingPaused>
<ProcessExited />
</Test>
</DebuggerTests>

8
src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs
Unescape View File

@ -145,6 +145,7 @@ namespace Debugger.Tests { @@ -145,6 +145,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;"
FullName="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.Metod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -208,6 +209,7 @@ namespace Debugger.Tests { @@ -208,6 +209,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;"
FullName="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.GenericMethod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -271,6 +273,7 @@ namespace Debugger.Tests { @@ -271,6 +273,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;"
FullName="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.StaticMetod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -334,6 +337,7 @@ namespace Debugger.Tests { @@ -334,6 +337,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;"
FullName="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.StaticGenericMethod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -397,6 +401,7 @@ namespace Debugger.Tests { @@ -397,6 +401,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;"
FullName="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.Metod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -460,6 +465,7 @@ namespace Debugger.Tests { @@ -460,6 +465,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;"
FullName="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.GenericMethod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -523,6 +529,7 @@ namespace Debugger.Tests { @@ -523,6 +529,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;"
FullName="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.StaticMetod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -586,6 +593,7 @@ namespace Debugger.Tests { @@ -586,6 +593,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;"
FullName="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.StaticGenericMethod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"

12
src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs
Unescape View File

@ -142,6 +142,7 @@ namespace Debugger.Tests { @@ -142,6 +142,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.get_privateProperty"
IsInternal="False"
IsMyCode="True"
IsPrivate="True"
IsProtected="False"
IsPublic="False"
@ -155,6 +156,7 @@ namespace Debugger.Tests { @@ -155,6 +156,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.get_publicProperty"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -168,6 +170,7 @@ namespace Debugger.Tests { @@ -168,6 +170,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.get_protectedProperty"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="True"
IsPublic="False"
@ -181,6 +184,7 @@ namespace Debugger.Tests { @@ -181,6 +184,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.get_internalProperty"
IsInternal="True"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="False"
@ -194,6 +198,7 @@ namespace Debugger.Tests { @@ -194,6 +198,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.get_staticProperty"
IsInternal="False"
IsMyCode="True"
IsPrivate="True"
IsProtected="False"
IsPublic="False"
@ -207,6 +212,7 @@ namespace Debugger.Tests { @@ -207,6 +212,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.privateMethod"
IsInternal="False"
IsMyCode="True"
IsPrivate="True"
IsProtected="False"
IsPublic="False"
@ -220,6 +226,7 @@ namespace Debugger.Tests { @@ -220,6 +226,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.publicMethod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -233,6 +240,7 @@ namespace Debugger.Tests { @@ -233,6 +240,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.protectedMethod"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="True"
IsPublic="False"
@ -246,6 +254,7 @@ namespace Debugger.Tests { @@ -246,6 +254,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.internalMethod"
IsInternal="True"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="False"
@ -259,6 +268,7 @@ namespace Debugger.Tests { @@ -259,6 +268,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.staticMethod"
IsInternal="False"
IsMyCode="True"
IsPrivate="True"
IsProtected="False"
IsPublic="False"
@ -272,6 +282,7 @@ namespace Debugger.Tests { @@ -272,6 +282,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata.Main"
IsInternal="False"
IsMyCode="True"
IsPrivate="False"
IsProtected="False"
IsPublic="True"
@ -285,6 +296,7 @@ namespace Debugger.Tests { @@ -285,6 +296,7 @@ namespace Debugger.Tests {
DeclaringType="Debugger.Tests.TestPrograms.Metadata"
FullName="Debugger.Tests.TestPrograms.Metadata..ctor"
IsInternal="False"
IsMyCode="False"
IsPrivate="False"
IsProtected="False"
IsPublic="True"

Write Preview
Loading…
Cancel
Save