Skip to content
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.

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

[wasm][debugger] Implement support to symbolOptions from dap. #79284

Merged
merged 26 commits into from
Jan 23, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fcf126b
Draft to implement support to symbolOptions from dap.
thaystg Dec 6, 2022
2d191e2
Merge remote-tracking branch 'upstream/main' into thays_support_symbo…
thaystg Dec 6, 2022
2850e02
removing debugger.launch
thaystg Dec 6, 2022
e00341e
Adding tests and fix compilation error
thaystg Dec 6, 2022
d9edba7
Adding test case.
thaystg Dec 6, 2022
524531f
Fix test cases, and implement support to PDBChecksum used on nuget.or…
thaystg Dec 8, 2022
fa2899a
Merge remote-tracking branch 'upstream/main' into thays_support_symbo…
thaystg Dec 8, 2022
2c3dddd
merge
thaystg Dec 12, 2022
8218e60
Fixing tests.
thaystg Dec 19, 2022
5e62ffe
Tests are timing out.
thaystg Dec 19, 2022
5374f0a
Apply suggestions from code review
thaystg Jan 6, 2023
4e6f443
adressing @radical comments.
thaystg Jan 6, 2023
21ff307
Addressing @radical comment.
thaystg Jan 6, 2023
a352202
Addressing @radical comments.
thaystg Jan 10, 2023
c954ad3
Apply suggestions from code review
thaystg Jan 17, 2023
9c384a4
Addressing @radical comments.
thaystg Jan 17, 2023
5648b8f
Addressing @radical comments
thaystg Jan 18, 2023
3366e20
Merge branch 'main' into thays_support_symbolOptions
thaystg Jan 18, 2023
8f00d90
use MicrosoftCodeAnalysisCSharpVersion for scripting package.
thaystg Jan 18, 2023
af713af
Adding more tests as asked by @radical
thaystg Jan 19, 2023
04e3372
Merge branch 'main' into thays_support_symbolOptions
thaystg Jan 19, 2023
ecc3730
Merge branch 'main' into thays_support_symbolOptions
radical Jan 20, 2023
9ad0aa5
[wasm] some cleanup
radical Jan 20, 2023
5ca16da
remove debug spew
radical Jan 21, 2023
b48ba60
Merge remote-tracking branch 'origin' into thays_support_symbolOptions
thaystg Jan 23, 2023
8bf7b71
Addressing radical comment.
thaystg Jan 23, 2023
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
4 changes: 4 additions & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<MicrosoftCodeAnalysisCSharpVersion>4.5.0-1.22564.5</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.5.0-1.22564.5</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.5.0-1.22564.5</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisCSharpScriptingVersion>4.5.0-1.22564.5</MicrosoftCodeAnalysisCSharpScriptingVersion>
</PropertyGroup>
<!--
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
Expand Down Expand Up @@ -244,5 +245,8 @@
<runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>1.0.0-alpha.1.22566.1</runtimewinx64MicrosoftNETCoreRuntimeJITToolsVersion>
<runtimeosx110arm64MicrosoftNETCoreRuntimeJITToolsVersion>1.0.0-alpha.1.22566.1</runtimeosx110arm64MicrosoftNETCoreRuntimeJITToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeJITToolsVersion>1.0.0-alpha.1.22566.1</runtimeosx1012x64MicrosoftNETCoreRuntimeJITToolsVersion>
<!-- BrowserDebugProxy libs -->
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
</PropertyGroup>
</Project>
7 changes: 4 additions & 3 deletions src/mono/mono/component/debugger-engine.c
Original file line number Diff line number Diff line change
Expand Up @@ -975,10 +975,11 @@ mono_de_ss_update (SingleStepReq *req, MonoJitInfo *ji, SeqPoint *sp, void *tls,
if (minfo)
loc = mono_debug_method_lookup_location (minfo, sp->il_offset);

if (!loc) {
PRINT_DEBUG_MSG (1, "[%p] No line number info for il offset %x, continuing single stepping.\n", (gpointer) (gsize) mono_native_thread_id_get (), sp->il_offset);
if (!loc) { //we should not continue single stepping because the client side can have symbols loaded dynamically
PRINT_DEBUG_MSG (1, "[%p] No line number info for il offset %x, don't know if it's in the same line single stepping.\n", (gpointer) (gsize) mono_native_thread_id_get (), sp->il_offset);
req->last_method = method;
hit = FALSE;
req->last_line = -1;
return hit;
radical marked this conversation as resolved.
Show resolved Hide resolved
} else if (loc && method == req->last_method && loc->row == req->last_line) {
int nframes;
rt_callbacks.ss_calculate_framecount (tls, ctx, FALSE, NULL, &nframes);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<_browserDebugHostFiles Include="$(ArtifactsDir)bin\BrowserDebugHost\$(TargetArchitecture)\$(Configuration)\Newtonsoft.Json.dll" />
<_browserDebugHostFiles Include="$(ArtifactsDir)bin\BrowserDebugHost\$(TargetArchitecture)\$(Configuration)\Microsoft.CodeAnalysis.CSharp.Scripting.dll" />
<_browserDebugHostFiles Include="$(ArtifactsDir)bin\BrowserDebugHost\$(TargetArchitecture)\$(Configuration)\Microsoft.CodeAnalysis.Scripting.dll" />
<_browserDebugHostFiles Include="$(ArtifactsDir)bin\BrowserDebugHost\$(TargetArchitecture)\$(Configuration)\Microsoft.SymbolStore.dll" />
<_browserDebugHostFiles Include="$(ArtifactsDir)bin\BrowserDebugHost\$(TargetArchitecture)\$(Configuration)\Microsoft.FileFormats.dll" />

<PackageFile Include="@(_browserDebugHostFiles)" TargetPath="tools\$(NetCoreAppCurrent)\" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/mono/wasm/debugger/BrowserDebugHost/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,7 @@ async Task ConnectProxy(HttpContext context)
try
{
var loggerFactory = context.RequestServices.GetService<ILoggerFactory>();
context.Request.Query.TryGetValue("urlSymbolServer", out StringValues urlSymbolServerList);
var proxy = new DebuggerProxy(loggerFactory, urlSymbolServerList.ToList(), runtimeId, options: options);
var proxy = new DebuggerProxy(loggerFactory, runtimeId, options: options);

System.Net.WebSockets.WebSocket ideSocket = await context.WebSockets.AcceptWebSocketAsync();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.7.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.7" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(MicrosoftCodeAnalysisCSharpScriptingVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
<PackageReference Include="Microsoft.SymbolStore" Version="$(MicrosoftSymbolStoreVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
</ItemGroup>

</Project>
Loading