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

Switch File functions, classes, and types to ValueStores (#3316)

Browse Source 
Building on #3313, start using ValueStore on File. Functions and classes
are straightforward. Types here I present as a borderline case where
maybe we want a more bespoke API, but maybe this is okay? Most other
things probably need a slightly different API, which although I might do
that for a consistent interface, felt more out-of-scope for this change.
This commit is contained in:
Jon Ross-Perkins
2023-10-20 22:40:18 +00:00
committed by GitHub
parent 843dd40f22
commit 7e9d644e1f
14 changed files with 76 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_function.cpp
+5 -4
View File
@@ -80,7 +80,7 @@ static auto BuildFunctionDeclaration(Context& context, bool is_definition)
// IDs in the signature.
if (is_definition) {
auto& function_info =
context.semantics_ir().GetFunction(function_decl.function_id);
context.semantics_ir().functions().Get(function_decl.function_id);
function_info.param_refs_id = param_refs_id;
function_info.return_type_id = return_type_id;
function_info.return_slot_id = return_slot_id;
@@ -93,7 +93,7 @@ static auto BuildFunctionDeclaration(Context& context, bool is_definition)
// Create a new function if this isn't a valid redeclaration.
if (!function_decl.function_id.is_valid()) {
function_decl.function_id = context.semantics_ir().AddFunction(
function_decl.function_id = context.semantics_ir().functions().Add(
{.name_id = name_context.state ==
DeclarationNameStack::NameContext::State::Unresolved
? name_context.unresolved_name_id
@@ -138,7 +138,8 @@ auto HandleFunctionDefinition(Context& context, Parse::Node parse_node)
// and otherwise add an implicit `return;`.
if (context.is_current_position_reachable()) {
if (context.semantics_ir()
.GetFunction(function_id)
.functions()
.Get(function_id)
.return_type_id.is_valid()) {
CARBON_DIAGNOSTIC(
MissingReturnStatement, Error,
@@ -160,7 +161,7 @@ auto HandleFunctionDefinitionStart(Context& context, Parse::Node parse_node)
// Process the declaration portion of the function.
auto [function_id, decl_id] =
BuildFunctionDeclaration(context, /*is_definition=*/true);
auto& function = context.semantics_ir().GetFunction(function_id);
auto& function = context.semantics_ir().functions().Get(function_id);
// Track that this declaration is the definition.
if (function.definition_id.is_valid()) {