[mono] Fix assertion while adding a new method using Hot Reload. #75432
Conversation
This file contains 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
dotnet-issue-labeler
bot
added
the
area-EnC-mono
ghost
assigned 
lambdageek
approved these changes
Sep 12, 2022
lewing
approved these changes
Sep 12, 2022
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3038704708 |
|
@thaystg backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix assertion while adding a new method using Hot Reload.
.git/rebase-apply/patch:479: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs
M src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
M src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
CONFLICT (content): Merge conflict in src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj
Auto-merging src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
Auto-merging src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix assertion while adding a new method using Hot Reload.
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! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
add_method_to_baselineto avoid the assertion.Fixes #75324