Skip to content
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

[mono][jit] Fix passing of byref arguments in mono_gsharedvt_constrai… #97721

Merged
merged 1 commit into from
Jan 31, 2024

Conversation

vargaz
Copy link
Contributor

@vargaz vargaz commented Jan 30, 2024

…ned_call ().

@ghost ghost assigned vargaz Jan 30, 2024
@vargaz vargaz added the NO-REVIEW Experimental/testing PR, do NOT review it label Jan 30, 2024
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jan 30, 2024
@ghost
Copy link

ghost commented Jan 30, 2024

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

…ned_call ().

Author: vargaz
Assignees: vargaz
Labels:

NO-REVIEW, area-CodeGen-coreclr

Milestone: -

@vargaz
Copy link
Contributor Author

vargaz commented Jan 30, 2024

/azp run runtime-extra-platforms

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vargaz
Copy link
Contributor Author

vargaz commented Jan 30, 2024

/azp run runtime-extra-platforms

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vargaz
Copy link
Contributor Author

vargaz commented Jan 31, 2024

/azp run runtime-extra-platforms

@vargaz
Copy link
Contributor Author

vargaz commented Jan 31, 2024

/azp run runtime-wasm

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

1 similar comment
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vargaz vargaz marked this pull request as ready for review January 31, 2024 05:45
@vargaz vargaz added area-Codegen-AOT-mono and removed NO-REVIEW Experimental/testing PR, do NOT review it area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI labels Jan 31, 2024
@vargaz vargaz merged commit a97ddd2 into dotnet:main Jan 31, 2024
160 of 163 checks passed
@vargaz vargaz deleted the fix-97625 branch January 31, 2024 23:32
@lambdageek
Copy link
Member

@vargaz we should re-enable these two tvOS tests: #97224

@vargaz
Copy link
Contributor Author

vargaz commented Feb 1, 2024

/backport to release/8.0-staging

Copy link
Contributor

github-actions bot commented Feb 1, 2024

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/7739495136

Copy link
Contributor

github-actions bot commented Feb 1, 2024

@vargaz backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: [mono][jit] Fix passing of byref arguments in mono_gsharedvt_constrained_call ().
Using index info to reconstruct a base tree...
M	src/mono/mono/mini/jit-icalls.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/jit-icalls.c
CONFLICT (content): Merge conflict in src/mono/mono/mini/jit-icalls.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 [mono][jit] Fix passing of byref arguments in mono_gsharedvt_constrained_call ().
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 128

Please backport manually!

Copy link
Contributor

github-actions bot commented Feb 1, 2024

@vargaz an error occurred while backporting to release/8.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

vargaz added a commit to vargaz/runtime that referenced this pull request Feb 2, 2024
jeffschwMSFT pushed a commit that referenced this pull request Feb 9, 2024
…ono_gsharedvt_constrained_call (). (#97721) (#97850)

Fixes #97625.

Co-authored-by: Larry Ewing <lewing@microsoft.com>
@github-actions github-actions bot locked and limited conversation to collaborators Mar 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants