-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Do not use MarkPrecodeAsStableEntrypoint with portable entrypoints #120467
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
Closed
radekdoulik
wants to merge
1
commit into
dotnet:main
from
radekdoulik:clr-interp-wasm-do-not-call-MarkPrecodeAsStableEntrypoint
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is needed. See the implementation in
MarkPrecodeAsStableEntrypoint()
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't seem related to the referenced issue, #120319, that states
Precode::GetPrecodeFromEntryPoint()
. We should be examining the callsite ofPrecode::GetPrecodeFromEntryPoint()
and understand its intent.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with Aaron that we should be cleaning this up more aggressively so that we do not have to be finding and fixing Precode paths one at a time.
For example, can we place all occurrences of
HasPrecode
/GetPrecode
/enum_flag3_HasPrecode
under#ifndef FEATURE_PORTABLE_ENTRYPOINTS
? If we are not ready this yet, changeHasPrecode
to return unconditional false and ifdef outenum_flag3_HasPrecode
flag at least?Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you give me more context here? Besides asserts, it sets the HasStableEntryPoint and HasPrecode flags. My assumption was that we don't want any of these flags set as the portable entrypoints are stable once we pass
DoPrestub(...)
and we don't have real precode, so we don't want to have that flag set either.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is happening here is that we set
HasStableEntrypoint
andHasPrecode
inMethodDesc::MarkPrecodeAsStableEntrypoint()
. Later we reach the assert inPrecode::GetPrecodeFromEntryPoint()
whenMethodDesc::IsPointingToPrestub()
checks these flags and because they are set and it callsGetPrecode()->IsPointingToPrestub()
. The end of stacktrace looks like this:It makes the failing test from #120319 pass.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@radekdoulik I see what you're saying here. This is part of the work that didn't get completed during the initial work I was doing. If you look at
precode_portable.hpp
, there are many dummy implemntations for thePrecode
infrastructure. We should work on removing all of those and defining them away. I will work on this tomorrow too.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AaronRobinsonMSFT This sounds great. Do you want me to make more changes here, so we can merge it or do you want to make it part of your changes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are still few places, when I ifdef it out, I am getting
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would close this PR. There is a non-trivial amount of clean-up here and I've already got a head start on some of it. Thanks for pushing on the issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great, thanks for looking at it.