[mono][interp] Fix inlining of ldarga #97553
Conversation
ghost
assigned 
|
Tagging subscribers to this area: @BrzVlad, @kotlarmilos Issue DetailsWhen inlining a method, all arguments are first copied to new vars. Ldarga is going to be applied on these copies. We were loading the address of the wrong var due to typo. Fixes #97377
|
|
@lewing This needs backport |
|
/backport to release/8.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/7671373180 |
|
@lewing 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][interp] Fix inlining of ldarga
Using index info to reconstruct a base tree...
M src/mono/mono/mini/interp/transform.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/interp/transform.c
CONFLICT (content): Merge conflict in src/mono/mono/mini/interp/transform.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][interp] Fix inlining of ldarga
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! |
|
@lewing 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. |
When inlining a method, all arguments are first copied to new vars. Ldarga is going to be applied on these copies. We were loading the address of the wrong var due to typo.
Fixes #97377