[wasm][debugger] Hide members from classes that don't have debug information #73982
Conversation
|
Tagging subscribers to this area: @thaystg Issue DetailsDo not show members from classes that don't have debug information if JMC is enabled. Fixes #43184
|
| var typeInfo = await sdbHelper.GetTypeInfo(containerTypeId, token); | ||
| if (typeInfo.Info.IsNonUserCode && getCommandOptions.HasFlag(GetObjectCommandOptions.JustMyCode)) | ||
| return fieldValues; | ||
|
|
| @@ -591,6 +594,11 @@ JObject GetNotAutoExpandableObject(int methodId, string propertyName, bool isSta | |||
| if (!getCommandType.HasFlag(GetObjectCommandOptions.WithProperties)) | |||
| return GetMembersResult.FromValues(allMembers.Values, sortByAccessLevel); | |||
|
|
|||
| var typeInfo = await sdbHelper.GetTypeInfo(typeId, token); | |||
|
|
|||
| if (typeInfo.Info.IsNonUserCode && getCommandType.HasFlag(GetObjectCommandOptions.JustMyCode)) | |||
There was a problem hiding this comment.
Wouldn't this add fields for non-my-code types? Should it moved to the beginning of the loop?
| System.Diagnostics.Debugger.Break(); | ||
| } | ||
|
|
||
| public int myField; |
There was a problem hiding this comment.
Add custom, and autogenerated properties too.
I'm not sure I understand. Is this correct? :
Also, this won't completely fix #43184, because this is still not returning the non-public members in |
|
Other than the comments here, and some from discussion offline, this LGTM, assuming the tests pass 👍 |
| var typeInfo = await sdbHelper.GetTypeInfo(typeId, token); | ||
|
|
||
| if (typeInfo.Info.IsNonUserCode && getCommandType.HasFlag(GetObjectCommandOptions.JustMyCode)) | ||
| break; | ||
|
|
There was a problem hiding this comment.
This can be right after int typeId = typeIdsIncludingParents[I];.
src/mono/wasm/debugger/tests/debugger-test-without-debug-symbols-to-load/test.cs
Outdated
Show resolved
Hide resolved
src/mono/wasm/debugger/tests/debugger-test-without-debug-symbols-to-load/test.cs
Outdated
Show resolved
Hide resolved
| @@ -63,6 +64,7 @@ | |||
|
|
|||
| <WasmAssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackRidDir)native"/> | |||
| <WasmAssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackRidDir)lib\$(NetCoreAppCurrent)"/> | |||
| <WasmAssemblySearchPaths Include="$(OutDir)"/> | |||
Co-authored-by: Ankit Jain <radical@gmail.com>
|
/backport to release/7.0-rc1 |
|
Started backporting to release/7.0-rc1: https://github.com/dotnet/runtime/actions/runs/2871012035 |
ghost
locked as resolved and limited conversation to collaborators
Do not show members from classes that don't have debug information if JMC is enabled.
Fixes #43184