Fix ICE when const closure appears inside a non-const trait method#154957
Open
lapla-cogito wants to merge 1 commit intorust-lang:mainfrom
Open
Fix ICE when const closure appears inside a non-const trait method#154957lapla-cogito wants to merge 1 commit intorust-lang:mainfrom
lapla-cogito wants to merge 1 commit intorust-lang:mainfrom
Conversation
Collaborator
|
rustbot has assigned @dingxiangfei2009. Use Why was this reviewer chosen?The reviewer was selected based on:
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #153891
hir_body_const_context()unconditionally delegated to the parent's const context for const closures, returningNonewhen the parent had no const context. This causedmir_const_qualif()to hit aspan_bug!, sincemir_promoted()had already decided to call it based on the closure's own syntactic constness. Fall back toConstContext::ConstFnwhen the parent's const context isNone, so that the const closure body is still properly const-checked rather than triggering an ICE.Examining another attempt at this issue (which has already been closed), I thought that its approach represents a workaround fix to avoid inconsistencies in the caller of
mir_promoted(), whereas I think the correct behavior is forhir_body_const_context()itself to return the proper value.