-
Couldn't load subscription status.
- Fork 5.2k
[mono] [hotreload] Adjust row_size and size_bitfield from the baseline based on the delta sizes #113995
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.
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
Conversation
… than the baselike table.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copilot wasn't able to review any files in this pull request.
Files not reviewed (1)
- src/mono/mono/component/hot_reload.c: Language not supported
|
failures are unrelated. can we add a test for this? |
I tried but I couldn't reproduce. |
added the test case. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, please fix the whitespace additions in src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
|
/backport to release/9.0-staging |
|
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/14204570483 |
|
@thaystg backporting to "release/9.0-staging" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix applying hot reload changes when the delta table has a bigger len than the baselike table.
Applying: Fixing test failures.
Applying: Fixing assertion condition
Applying: Fix braces
Applying: Addign test case
.git/rebase-apply/patch:30117: trailing whitespace.
[ActiveIssue("https://github.com/dotnet/runtime/issues/54617", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
.git/rebase-apply/patch:30126: trailing whitespace.
[ActiveIssue("https://github.com/dotnet/runtime/issues/54617", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
.git/rebase-apply/patch:30135: trailing whitespace.
[ActiveIssue("https://github.com/dotnet/runtime/issues/54617", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
.git/rebase-apply/patch:30144: trailing whitespace.
.git/rebase-apply/patch:30153: trailing whitespace.
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
M src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj
Auto-merging src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0005 Addign test case
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
e824e08 to
40b079d
Compare
40b079d to
e824e08
Compare
|
/ba-g BuildAnalysis malfunction, all the errors are already reported |
| @@ -0,0 +1,38 @@ | |||
| using System; | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All .cs files in the repo should have license headers.
|
|
||
| public static void Method2(int x2) | ||
| { | ||
| // Example body for Method2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should not be committing 100 kBs of copilot generated boilerplate comments into the repo. This and the other file should be composed from one-liners like:
...
public static void Method3() { }
public static void Method4() { }
...
Fix applying hot reload changes when the delta table has a bigger len than the baseline table.
Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2396448