Fix nested non-byref like VC with no pointer fields #80642
Merged
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
AaronRobinsonMSFT
force-pushed
the
runtime_80624
branch
from
11cea99
to
21bf6f5
Compare
|
@BrzVlad @vargaz @lambdageek Any thoughts on the llvmfullaot legs? |
|
The failure is in the newly added tests, so it definitely looks like a mono problem. I'd suggest disabling it for now for mono. |
src/tests/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case13.cs
Outdated
Show resolved
Hide resolved
src/tests/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case13.cs
Outdated
Show resolved
Hide resolved
src/tests/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case13.cs
Outdated
Show resolved
Hide resolved
lambdageek
reviewed
Jan 17, 2023
|
@mangod9 Can you suggest someone who could help review this change? @davidwrighton is away. |
|
@trylek, who can take a look. |
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3961567258 |
|
@AaronRobinsonMSFT 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 nested non-byref like VC with no pointer fields
Applying: Add tests
Applying: Fix test typo
Applying: Disable new test on llvmaot
Using index info to reconstruct a base tree...
M src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Disable new test on llvmaot
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! |
|
@AaronRobinsonMSFT 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. |
AaronRobinsonMSFT
added a commit
to AaronRobinsonMSFT/runtime
that referenced
this pull request
Jan 19, 2023
* Fix nested non-byref like VC with no pointer fields
mdh1418
pushed a commit
to mdh1418/runtime
that referenced
this pull request
Jan 24, 2023
* Fix nested non-byref like VC with no pointer fields
carlossanlop
pushed a commit
that referenced
this pull request
Feb 8, 2023
ghost
locked as resolved and limited conversation to collaborators
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.
Tests need to be added. This is just for checking existing tests on all platforms first.
Fixes #80624