Skip to content

Publish the stack-frame regex once instead of racing on lazy init #10702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jakub Jareš (nohwnd) wants to merge 3 commits into
base: main
Choose a base branch
from
+17 −30
Open

Publish the stack-frame regex once instead of racing on lazy init #10702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33709da
Publish the stack-frame regex once instead of racing on lazy init
nohwnd Aug 24, 2026
8787b01
Correct the comment about repeated regex construction
nohwnd Aug 24, 2026
979a3bb
Use LazyInitializer for stack-frame regexes
Evangelink Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/StackTraceHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ internal static bool TryFindLocationFromStackFrame(string? errorStackTrace, [Not

private static bool TryGetStackFrameLocation(string stackFrame, out int line, [NotNullWhen(true)] out string? file, out string? place)
{
InitializeRegex();
Regex regex = GetOrCreateRegex();

// stack frame looks like this ' at Program.<Main>$(String[] args) in S:\t\ConsoleApp81\ConsoleApp81\Program.cs:line 9'
Match match;
try
{
match = s_regex.Match(stackFrame);
match = regex.Match(stackFrame);
}
catch (RegexMatchTimeoutException)
{
Expand Down Expand Up @@ -78,18 +78,12 @@ private static bool TryGetStackFrameLocation(string stackFrame, out int line, [N
return hasLocation;
}

[MemberNotNull(nameof(s_regex))]
private static void InitializeRegex()
{
if (s_regex is not null)
{
return;
}

// Keep this location-only pattern because MSBuild only reports frames that can provide a file and line.
s_regex = new Regex(
StackTraceRegexHelper.CreateFrameRegexPattern(matchFramesWithoutLocation: false),
RegexOptions.Compiled,
StackTraceRegexHelper.MatchTimeout);
}
private static Regex GetOrCreateRegex()
=> LazyInitializer.EnsureInitialized(
ref s_regex,
// Keep this location-only pattern because MSBuild only reports frames that can provide a file and line.
static () => new Regex(
StackTraceRegexHelper.CreateFrameRegexPattern(matchFramesWithoutLocation: false),
RegexOptions.Compiled,
StackTraceRegexHelper.MatchTimeout))!;
}
21 changes: 7 additions & 14 deletions src/Platform/Microsoft.Testing.Platform/Helpers/StackTraceHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,13 @@ internal static partial class StackTraceHelper
#else
private static Regex? s_regex;

[MemberNotNull(nameof(s_regex))]
public static Regex GetFrameRegex()
{
if (s_regex is not null)
{
return s_regex;
}

// Specifying no timeout, the regex is linear. And the timeout does not measure the regex only, but measures also any
// thread suspends, so the regex gets blamed incorrectly.
s_regex = new Regex(
StackTraceRegexHelper.CreateFrameRegexPattern(matchFramesWithoutLocation: true),
RegexOptions.Compiled | RegexOptions.ExplicitCapture);
return s_regex;
}
=> LazyInitializer.EnsureInitialized(
ref s_regex,
// Specifying no timeout, the regex is linear. And the timeout does not measure the regex only, but measures also any
// thread suspends, so the regex gets blamed incorrectly.
static () => new Regex(
StackTraceRegexHelper.CreateFrameRegexPattern(matchFramesWithoutLocation: true),
RegexOptions.Compiled | RegexOptions.ExplicitCapture))!;
#endif
}