Refactor CheckIsAllowedRedecl and stop function definition merging #4800
Conversation
This file contains 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
zygoloid
approved these changes
Jan 14, 2025
toolchain/check/handle_interface.cpp
Outdated
| context, Lex::TokenKind::Interface, existing_interface.name_id, | ||
| RedeclInfo(interface_info, node_id, is_definition), | ||
| RedeclInfo(existing_interface, existing_interface.latest_decl_id(), | ||
| existing_interface.is_defined()), | ||
| /*prev_import_ir_id=*/SemIR::ImportIRId::Invalid); | ||
|
|
||
| // Can't merge interface definitions due to the generic requirements. | ||
| // TODO: Should this also be mirrored to classes/functions for generics? | ||
| if (!is_definition || !existing_interface.is_defined()) { |
There was a problem hiding this comment.
Should we be using has_definition_started for consistency here (and a few lines above) too? I don't think it's possible to define an interface inside its own definition, but maybe that could happen during error recovery somehow?
There was a problem hiding this comment.
I don't think it makes much difference, but changed -- also, cleaned up some code paths that looked obsolete.
zygoloid
approved these changes
Jan 14, 2025
josh11b
reviewed
Jan 14, 2025
| @@ -453,10 +453,7 @@ auto HandleParseNode(Context& context, Parse::ImplDefinitionStartId node_id) | |||
| impl_decl_id, impl_info.scope_id, | |||
| context.generics().GetSelfSpecific(impl_info.generic_id)); | |||
| StartGenericDefinition(context); | |||
|
|
|||
| if (!impl_info.is_defined()) { | |||
There was a problem hiding this comment.
Do we have tests with two impl, class, function, interface definitions with the same signature?
There was a problem hiding this comment.
See tests which mention "error: redefinition of"
But also, see the CHECK on line 446 here
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.
Rename
CheckIsAllowedRedecltoDiagnoseIfInvalidRedeclto try to better document behavior, and clean up comments.This extends the no-merge-if-defined behavior to functions. It was already the case for class/interface, and just added for impl, so if anything functions were now inconsistent. I was kind of tempted to make a helper for it, but I didn't think of a great structure/name to get there:
DiagnoseRedefisn't always called when it's a redefinition, for example due toexterndiagnostics, it's hard to combine.Cleans up
is_definedcalls to rely more onhas_definition_started, removing some code paths that are unused since definitions aren't merged.