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

Add cache of template instantiations. (#3243)

Browse Source 
Also some drive-by comment and trace improvements.

Closes #2951
This commit is contained in:
Geoff Romer
2023-09-19 20:32:48 +00:00
committed by GitHub
parent a8ca499450
commit f747cb0c93
5 changed files with 98 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/interpreter/interpreter.cpp
+22 -9
View File
@@ -516,49 +516,62 @@ auto Interpreter::InstantiateType(Nonnull<const Value*> type,
<< source_loc << ")\n";
}
const Value* value = nullptr;
switch (type->kind()) {
case Value::Kind::VariableType: {
CARBON_ASSIGN_OR_RETURN(
Nonnull<const Value*> value,
value,
todo_.ValueOfNode(&cast<VariableType>(*type).binding(), source_loc));
if (const auto* location = dyn_cast<LocationValue>(value)) {
CARBON_ASSIGN_OR_RETURN(value,
heap_.Read(location->address(), source_loc));
}
return value;
break;
}
case Value::Kind::InterfaceType: {
const auto& interface_type = cast<InterfaceType>(*type);
CARBON_ASSIGN_OR_RETURN(
Nonnull<const Bindings*> bindings,
InstantiateBindings(&interface_type.bindings(), source_loc));
return arena_->New<InterfaceType>(&interface_type.declaration(),
bindings);
value =
arena_->New<InterfaceType>(&interface_type.declaration(), bindings);
break;
}
case Value::Kind::NamedConstraintType: {
const auto& constraint_type = cast<NamedConstraintType>(*type);
CARBON_ASSIGN_OR_RETURN(
Nonnull<const Bindings*> bindings,
InstantiateBindings(&constraint_type.bindings(), source_loc));
return arena_->New<NamedConstraintType>(&constraint_type.declaration(),
bindings);
value = arena_->New<NamedConstraintType>(&constraint_type.declaration(),
bindings);
break;
}
case Value::Kind::ChoiceType: {
const auto& choice_type = cast<ChoiceType>(*type);
CARBON_ASSIGN_OR_RETURN(
Nonnull<const Bindings*> bindings,
InstantiateBindings(&choice_type.bindings(), source_loc));
return arena_->New<ChoiceType>(&choice_type.declaration(), bindings);
value = arena_->New<ChoiceType>(&choice_type.declaration(), bindings);
break;
}
case Value::Kind::AssociatedConstant: {
CARBON_ASSIGN_OR_RETURN(
Nonnull<const Value*> type_value,
EvalAssociatedConstant(cast<AssociatedConstant>(type), source_loc));
return type_value;
value = type_value;
break;
}
default:
return type;
value = type;
break;
}
if (trace_stream_->is_enabled()) {
trace_stream_->End() << "instantiated type `" << *type << "` as `" << *value
<< "` (" << source_loc << ")\n";
}
return value;
}
auto Interpreter::InstantiateBindings(Nonnull<const Bindings*> bindings,