carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Basic support for implementing and using a parameterized interface. (#4203)

Browse Source 
The main change here is to form a specific when checking an interface
function against an impl function, instead of just substituting the
`Self` type.
This commit is contained in:
Richard Smith
2024-08-09 01:05:03 +00:00
committed by GitHub
parent b2a13afb73
commit 4a21b6af9b
54 changed files with 998 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/function.cpp
+5 -10
View File
@@ -5,7 +5,6 @@
#include "toolchain/check/function.h"
#include "toolchain/check/merge.h"
#include "toolchain/check/subst.h"
#include "toolchain/sem_ir/ids.h"
namespace Carbon::Check {
@@ -13,10 +12,10 @@ namespace Carbon::Check {
auto CheckFunctionTypeMatches(Context& context,
const SemIR::Function& new_function,
const SemIR::Function& prev_function,
Substitutions substitutions, bool check_syntax)
-> bool {
SemIR::SpecificId prev_specific_id,
bool check_syntax) -> bool {
if (!CheckRedeclParamsMatch(context, DeclParams(new_function),
DeclParams(prev_function), substitutions,
DeclParams(prev_function), prev_specific_id,
check_syntax)) {
return false;
}
@@ -25,16 +24,12 @@ auto CheckFunctionTypeMatches(Context& context,
// use it here.
auto new_return_type_id =
new_function.GetDeclaredReturnType(context.sem_ir());
auto prev_return_type_id = prev_function.GetDeclaredReturnType(
context.sem_ir(), SemIR::SpecificId::Invalid);
auto prev_return_type_id =
prev_function.GetDeclaredReturnType(context.sem_ir(), prev_specific_id);
if (new_return_type_id == SemIR::TypeId::Error ||
prev_return_type_id == SemIR::TypeId::Error) {
return false;
}
if (prev_return_type_id.is_valid()) {
prev_return_type_id =
SubstType(context, prev_return_type_id, substitutions);
}
if (!context.types().AreEqualAcrossDeclarations(new_return_type_id,
prev_return_type_id)) {
CARBON_DIAGNOSTIC(