Handle runtime implicit parameters, and self outside of methods
#4361
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
Oct 2, 2024
toolchain/check/generic.cpp
Outdated
Comment on lines
437
to
483
| auto RequireGenericParams(Context& context, SemIR::InstBlockId block_id) | ||
| -> void { | ||
| if (!block_id.is_valid() || block_id == SemIR::InstBlockId::Empty) { | ||
| return; | ||
| } | ||
|
|
||
| for (auto& inst_id : context.inst_blocks().Get(block_id)) { | ||
| if (!context.constant_values().Get(inst_id).is_constant()) { | ||
| // TODO: Change GetParamFromParamRefId to return the name instead of | ||
| // inspecting param.name_id. | ||
| auto [param_id, param] = | ||
| SemIR::Function::GetParamFromParamRefId(context.sem_ir(), inst_id); | ||
| if (param.name_id == SemIR::NameId::SelfValue) { | ||
| CARBON_DIAGNOSTIC(SelfParameterNotAllowed, Error, | ||
| "`self` parameter only allowed on functions"); | ||
| context.emitter().Emit(inst_id, SelfParameterNotAllowed); | ||
|
|
||
| ReplaceInstructionWithError(context, inst_id); | ||
| } else if (!context.constant_values().Get(inst_id).is_constant()) { | ||
| CARBON_DIAGNOSTIC(GenericParamMustBeConstant, Error, | ||
| "parameters of generic types must be constant"); | ||
| context.emitter().Emit(inst_id, GenericParamMustBeConstant); | ||
|
|
||
| // Replace the parameter with an invalid instruction so that we don't try | ||
| // constructing a generic based on it. Note this is updating the param | ||
| // refs block, not the actual params block, so will not be directly | ||
| // reflected in SemIR output. | ||
| inst_id = context.AddInstInNoBlock<SemIR::Param>( | ||
| context.insts().GetLocId(inst_id), | ||
| {.type_id = SemIR::TypeId::Error, | ||
| .name_id = SemIR::NameId::Base, | ||
| .runtime_index = SemIR::RuntimeParamIndex::Invalid}); | ||
| ReplaceInstructionWithError(context, inst_id); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| auto RequireGenericOrSelfImplicitParams(Context& context, | ||
| SemIR::InstBlockId block_id) -> void { | ||
| if (!block_id.is_valid() || block_id == SemIR::InstBlockId::Empty) { | ||
| return; | ||
| } | ||
| for (auto& inst_id : context.inst_blocks().Get(block_id)) { | ||
| // TODO: Change GetParamFromParamRefId to return the name instead of | ||
| // inspecting param.name_id. | ||
| auto [param_id, param] = | ||
| SemIR::Function::GetParamFromParamRefId(context.sem_ir(), inst_id); | ||
| if (param.name_id != SemIR::NameId::SelfValue && | ||
| !context.constant_values().Get(inst_id).is_constant()) { | ||
| CARBON_DIAGNOSTIC( | ||
| ImplictParamMustBeConstant, Error, | ||
| "implicit parameters of functions must be constant or `self`"); | ||
| context.emitter().Emit(inst_id, ImplictParamMustBeConstant); | ||
|
|
||
| ReplaceInstructionWithError(context, inst_id); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
These look very similar; would it make sense to combine these into a single function? Eg:
auto RequireGenericParams(Context& context, SemIR::InstBlockId block_id, bool allow_self)
-> void {
if (!block_id.is_valid() || block_id == SemIR::InstBlockId::Empty) {
return;
}
for (auto& inst_id : context.inst_blocks().Get(block_id)) {
// TODO: Change GetParamFromParamRefId to return the name instead of
// inspecting param.name_id.
auto [param_id, param] =
SemIR::Function::GetParamFromParamRefId(context.sem_ir(), inst_id);
if (param.name_id == SemIR::NameId::SelfValue) {
if (!allow_self) {
CARBON_DIAGNOSTIC(SelfParameterNotAllowed, Error,
"`self` parameter only allowed on functions");
context.emitter().Emit(inst_id, SelfParameterNotAllowed);
ReplaceInstructionWithError(context, inst_id);
}
} else if (!context.constant_values().Get(inst_id).is_constant()) {
CARBON_DIAGNOSTIC(
ImplicitParamMustBeConstant, Error,
"parameters of generic types must be constant");
CARBON_DIAGNOSTIC(
ImplictParamMustBeConstantOrSelf, Error,
"implicit parameters of functions must be constant or `self`");
context.emitter().Emit(
inst_id,
allow_self ? ImplicitParamMustBeConstantOrSelf : ImplicitParamMustBeConstant);
ReplaceInstructionWithError(context, inst_id);
}
}
}There was a problem hiding this comment.
Changing the function name, as discussed offline.
zygoloid
approved these changes
Oct 3, 2024
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.
Closes #4356, #4359