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

Case: The method has not been jitted yet #90821

Merged
merged 1 commit into from
Sep 18, 2023

Conversation

mikelle-rogers
Copy link
Member

This fixes the error introduced by this commit (which was reverted). The case that was missed was attempting to get the DJI for a method that had not yet been jitted.

@dotnet-issue-labeler
Copy link

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

@ghost
Copy link

ghost commented Aug 18, 2023

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

Issue Details

This fixes the error introduced by this commit (which was reverted). The case that was missed was attempting to get the DJI for a method that had not yet been jitted.

Author: mikelle-rogers
Assignees: mikelle-rogers
Labels:

area-System.Linq.Expressions, new-api-needs-documentation

Milestone: -

@mikelle-rogers mikelle-rogers marked this pull request as draft August 18, 2023 19:01
Copy link
Member

@tommcdon tommcdon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@mikelle-rogers
Copy link
Member Author

Used Visual Studio Validation.

@ghost
Copy link

ghost commented Sep 18, 2023

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

Issue Details

This fixes the error introduced by this commit (which was reverted). The case that was missed was attempting to get the DJI for a method that had not yet been jitted.

Author: mikelle-rogers
Assignees: mikelle-rogers
Labels:

area-Diagnostics-coreclr

Milestone: -

@marek-safar marek-safar merged commit bc97b0a into dotnet:main Sep 18, 2023
@mikelle-rogers
Copy link
Member Author

/backport to release/8.0

@github-actions
Copy link
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6318019624

@github-actions
Copy link
Contributor

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

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

Applying: the method has not been jitted yet
Using index info to reconstruct a base tree...
M	src/coreclr/debug/ee/functioninfo.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/debug/ee/functioninfo.cpp
CONFLICT (content): Merge conflict in src/coreclr/debug/ee/functioninfo.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 the method has not been jitted yet
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!

@github-actions
Copy link
Contributor

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

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

@ghost ghost locked as resolved and limited conversation to collaborators Oct 27, 2023
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.

5 participants