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

Produce a class value when converting {} to class type. (#1265)

Browse Source 
Previously we missed this special case because {} results in a
StructType value not a StructValue value.
This commit is contained in:
Richard Smith
2022-05-16 16:18:32 -07:00
committed by GitHub
parent 235cb88a8e
commit c48d024eea
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/interpreter/interpreter.cpp
+13 -1
View File
@@ -494,7 +494,6 @@ auto Interpreter::Convert(Nonnull<const Value*> value,
case Value::Kind::FunctionType:
case Value::Kind::PointerType:
case Value::Kind::AutoType:
case Value::Kind::StructType:
case Value::Kind::NominalClassType:
case Value::Kind::InterfaceType:
case Value::Kind::Witness:
@@ -548,6 +547,19 @@ auto Interpreter::Convert(Nonnull<const Value*> value,
<< *destination_type;
}
}
case Value::Kind::StructType: {
// The value `{}` has kind `StructType` not `StructValue`. This value can
// be converted to an empty class type.
if (auto* destination_class_type =
dyn_cast<NominalClassType>(destination_type)) {
CARBON_CHECK(cast<StructType>(*value).fields().empty())
<< "only an empty struct type value converts to class type";
CARBON_ASSIGN_OR_RETURN(Nonnull<const Value*> inst_dest,
InstantiateType(destination_type, source_loc));
return arena_->New<NominalClassValue>(inst_dest, value);
}
return value;
}
case Value::Kind::TupleValue: {
const auto& tuple = cast<TupleValue>(value);
std::vector<Nonnull<const Value*>> destination_element_types;