Uh oh!
There was an error while loading. Please reload this page.
[wasm] Correctly escape library names when generating symbols for .c - #79007
Merged
Conversation
.. files. Use th existing `FixupSymbolName` method for fixing library names too, when converting to symbols. Fixesdotnet#78992 .
.. as it is called frequently, and for repeated strings. For a consolewasm template build, we get 490 calls but only 140 of them are for unique strings.
ghost
commented
Nov 29, 2022
Tagging subscribers to 'arch-wasm': @lewing Issue Details.. files. Use the existing Fixes #78992 .
|
radical
commented
Nov 30, 2022
MemberAuthor
The test failure is #78194, and unrelated. |
radical
commented
Dec 2, 2022
MemberAuthor
/backport to release/7.0 |
Contributor
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3605025887 |
Contributor
@radical backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [wasm] Correctly escape library names when generating symbols for .c
Applying: [wasm] PInvokeTableGenerator: Use FixupSymbolName in more places
Applying: [wasm] *TableGenerator task: Cache the symbol name fixups
Applying: [wasm] IcallTableGenerator: fixup assembly name also, when used as a symbol
Applying: cleanup
Applying: Add tests
Using index info to reconstruct a base tree...
A src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
CONFLICT (content): Merge conflict in src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0006 Add tests
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
@radical an error occurred while backporting to release/7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
radical added a commit
to radical/runtime
that referenced
this pull request
Dec 2, 2022
…otnet#79007) * [wasm] Correctly escape library names when generating symbols for .c files. Use the existing `FixupSymbolName` method for fixing library names too, when converting to symbols. * [wasm] *TableGenerator task: Cache the symbol name fixups .. as it is called frequently, and for repeated strings. For a consolewasm template build, we get 490 calls but only 140 of them are for unique strings. * Add tests Fixesdotnet#78992 . (cherry picked from commit 85a9dfc)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
.. files.
Use the existing
FixupSymbolNamemethod for fixing library names too,when converting to symbols.
Fixes#78992 .