Skip to content

[wasm] Correctly escape library names when generating symbols for .c #79007

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

Merged
radical merged 8 commits into from
Nov 30, 2022
Merged

[wasm] Correctly escape library names when generating symbols for .c #79007

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
976abf0
[wasm] Correctly escape library names when generating symbols for .c
radical Nov 29, 2022
218c890
[wasm] PInvokeTableGenerator: Use FixupSymbolName in more places
radical Nov 29, 2022
985f6d5
[wasm] *TableGenerator task: Cache the symbol name fixups
radical Nov 29, 2022
7e6718c
[wasm] IcallTableGenerator: fixup assembly name also, when used as a …
radical Nov 29, 2022
a35bce8
cleanup
radical Nov 29, 2022
edec2a9
Merge remote-tracking branch 'origin/main' into pinvoke-escape-name
radical Nov 30, 2022
8ea2884
Add tests
radical Nov 30, 2022
afb6ef3
rename test
radical Nov 30, 2022
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
Next Next commit
[wasm] Correctly escape library names when generating symbols for .c 
.. files.

Use th existing `FixupSymbolName` method for fixing library names too,
when converting to symbols.

Fixes #78992 .
  • Loading branch information
@radical
radical committed Nov 29, 2022
commit 976abf0b76a888c294c7fde04c8a76679745a4a7
16 changes: 2 additions & 14 deletions src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ private void EmitPInvokeTable(StreamWriter w, Dictionary<string, string> modules

foreach (var module in modules.Keys)
{
string symbol = ModuleNameToId(module) + "_imports";
string symbol = FixupSymbolName(module) + "_imports";
w.WriteLine("static PinvokeImport " + symbol + " [] = {");

var assemblies_pinvokes = pinvokes.
Expand All @@ -255,7 +255,7 @@ private void EmitPInvokeTable(StreamWriter w, Dictionary<string, string> modules
w.Write("static void *pinvoke_tables[] = { ");
foreach (var module in modules.Keys)
{
string symbol = ModuleNameToId(module) + "_imports";
string symbol = FixupSymbolName(module) + "_imports";
w.Write(symbol + ",");
}
w.WriteLine("};");
Expand All @@ -266,18 +266,6 @@ private void EmitPInvokeTable(StreamWriter w, Dictionary<string, string> modules
}
w.WriteLine("};");

static string ModuleNameToId(string name)
{
if (name.IndexOfAny(s_charsToReplace) < 0)
return name;

string fixedName = name;
foreach (char c in s_charsToReplace)
fixedName = fixedName.Replace(c, '_');

return fixedName;
}

static bool ShouldTreatAsVariadic(PInvoke[] candidates)
{
if (candidates.Length < 2)
Expand Down