Skip to content

Commit 687e130

Browse files
committed
closes EvilBeaver#1541 Некорректно шагает через процедуру текущего модуля.
1 parent a951337 commit 687e130

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/ScriptEngine/Machine/MachineInstance.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,17 +1118,18 @@ private void Return(int arg)
11181118
else
11191119
{
11201120
PopFrame();
1121-
if(DebugStepInProgress())
1121+
if(IsSteppingOutFromHere())
11221122
EmitStopEventIfNecessary();
11231123
}
11241124
}
11251125

1126-
private bool DebugStepInProgress()
1126+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
1127+
private bool IsSteppingOutFromHere()
11271128
{
11281129
if (_stopManager == null)
11291130
return false;
11301131

1131-
return _stopManager.CurrentState == DebugState.SteppingOut || _stopManager.CurrentState == DebugState.SteppingOver;
1132+
return _stopManager.CurrentState == DebugState.SteppingOut;
11321133
}
11331134

11341135
private void JmpCounter(int arg)

0 commit comments

Comments
 (0)