Skip to content

No public description #2258

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.

Sign up for GitHub

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

Merged
copybara-service merged 1 commit into from
Sep 12, 2026
Merged

No public description #2258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions checker/internal/type_inference_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ Type TypeInferenceContext::InstantiateTypeParams(
case TypeKind::kUintWrapper:
return type;
case TypeKind::kTypeParam: {
absl::string_view name = type.AsTypeParam()->name();
TypeParamType type_param = type.GetTypeParam();
absl::string_view name = type_param.name();
if (IsTypeVar(name)) {
// Already instantiated (e.g. list comprehension variable).
return type;
Expand Down Expand Up @@ -494,7 +495,8 @@ bool TypeInferenceContext::OccursWithin(
// T3 -> T2 -> null_type;
Type substitution = type;
while (substitution.kind() == TypeKind::kTypeParam) {
absl::string_view param_name = substitution.AsTypeParam()->name();
TypeParamType type_param = substitution.GetTypeParam();
absl::string_view param_name = type_param.name();
if (param_name == var_name) {
return true;
}
Expand Down Expand Up @@ -534,15 +536,17 @@ bool TypeInferenceContext::IsAssignableWithConstraints(
}

if (to.kind() == TypeKind::kTypeParam) {
absl::string_view name = to.AsTypeParam()->name();
TypeParamType to_param = to.GetTypeParam();
absl::string_view name = to_param.name();
if (!OccursWithin(name, from, prospective_substitutions)) {
prospective_substitutions[name] = from;
return true;
}
}

if (from.kind() == TypeKind::kTypeParam) {
absl::string_view name = from.AsTypeParam()->name();
TypeParamType from_param = from.GetTypeParam();
absl::string_view name = from_param.name();
if (!OccursWithin(name, to, prospective_substitutions)) {
prospective_substitutions[name] = to;
return true;
Expand Down Expand Up @@ -663,11 +667,12 @@ Type TypeInferenceContext::FullySubstitute(const Type& type,
return MapType(arena_, key, value);
}
case TypeKind::kOpaque: {
OpaqueType opaque_type = type.GetOpaque();
std::vector<Type> types;
for (const auto& param : type.AsOpaque()->GetParameters()) {
for (const auto& param : opaque_type.GetParameters()) {
types.push_back(FullySubstitute(param, free_to_dyn));
}
return OpaqueType(arena_, type.AsOpaque()->name(), types);
return OpaqueType(arena_, opaque_type.name(), types);
}
default:
return type;
Expand Down
Loading