Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge branch 'main' into thays_implement_loaded_files_over_debugger_p…
…rotocol
  • Loading branch information
radical authored May 26, 2022
commit 72c1295e5602600479a37d7a2a1d3ee5d0add1a3
2 changes: 1 addition & 1 deletion src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,7 @@ public async IAsyncEnumerable<SourceFile> Load(SessionId id, string[] loaded_fil
new DebugItem
{
Url = url,
Data = Task.WhenAll(client.GetByteArrayAsync(url, token), pdb != null ? client.GetByteArrayAsync(pdb, token) : Task.FromResult<byte[]>(null))
Data = Task.WhenAll(MonoProxy.HttpClient.GetByteArrayAsync(url, token), pdb != null ? MonoProxy.HttpClient.GetByteArrayAsync(pdb, token) : Task.FromResult<byte[]>(null))
});
}
catch (Exception e)
Expand Down
21 changes: 21 additions & 0 deletions src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,7 @@ public MonoSDBHelper(MonoProxy proxy, ILogger logger, SessionId sessionId)
this.sessionId = sessionId;
this.VmMajorVersion = -1;
this.VmMinorVersion = -1;
ValueCreator = new(this, logger);
ResetStore(null);
}

Expand Down Expand Up @@ -2153,6 +2154,26 @@ public async Task<byte[][]> GetBytesFromAssemblyAndPdb(string assemblyName, Canc
ret[1] = pdb_buf;
return ret;
}
private static readonly string[] s_primitiveTypeNames = new[]
{
"bool",
"char",
"string",
"byte",
"sbyte",
"int",
"uint",
"long",
"ulong",
"short",
"ushort",
"float",
"double",
};

public static bool IsPrimitiveType(string simplifiedClassName)
=> s_primitiveTypeNames.Contains(simplifiedClassName);

}

internal static class HelperExtensions
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.