[mono][hot reload] Fix sequence point logic for compiler-generated methods in updates #65865
Conversation
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
-1 means there was some kind of problem 0 means 0 sequence points In particular for mono_ppdb_get_seq_points_enc a compiler-generated method might have 0 sequence points in the PDB delta, but we should consider that as ok, and not fall back to looking in the baseline image
For platforms where we use the remote executor, set the environment variable when starting the remote process. For WASM, pass --setenv when building the project.
lambdageek
requested review from
vargaz,
thaystg and
marek-safar
as code owners
ghost
added
the
|
/backport to release/7.0-preview2 |
|
Started backporting to release/7.0-preview2: https://github.com/dotnet/runtime/actions/runs/1895464774 |
|
@lambdageek backporting to release/7.0-preview2 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [tests] Pass PDB delta to ApplyUpdate
Applying: extra tracing output
Applying: Return 0 if a method has no sequence points
Applying: pass MONO_DEBUG=getn-seq-points to hot reload tests
Using index info to reconstruct a base tree...
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
CONFLICT (content): Merge conflict in src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 pass MONO_DEBUG=getn-seq-points to hot reload 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! |
vargaz
approved these changes
Feb 24, 2022
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.
If an update adds a compiler-generated method that doesn't have any sequence points, don't fall back to looking for sequence points in the baseline file - consider 0 sequence points as a success.
Also modify the hot reload tests to pass
MONO_DEBUG=gen-seq-pointsto the runtime (via remote executor or build properties) so that we exercise this code even when we don't have a debugger attached.Fixes #65808