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

Fix indirect import handling for functions. (#4258)

Browse Source 
The particular test this focused on is indirect_two_file in
toolchain/check/testdata/function/definition/no_prelude/extern_library.carbon.

This removes `parent_scope_id_for_new_inst` because I think it's
returning unhelpful results. The use was at the root of incorrect
results for the indirect import chain. `name_id_for_new_inst` is
actually wrapping a union, so it's more important.

The merging of `is_extern` and `first_owning_decl_id` in
`handle_function.cpp` feels like it's less correct with the changes
that've been made to `extern`. This ripples in tests, because the error
recovery shifts.

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Jon Ross-Perkins
2024-08-27 20:26:23 +00:00
committed by GitHub
co-authored by Richard Smith
parent 2a7c2c5df2
commit bed5fdcbbe
16 changed files with 139 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_function.cpp
+11 -8
View File
@@ -10,6 +10,7 @@
#include "toolchain/check/function.h"
#include "toolchain/check/generic.h"
#include "toolchain/check/handle.h"
#include "toolchain/check/import_ref.h"
#include "toolchain/check/interface.h"
#include "toolchain/check/merge.h"
#include "toolchain/check/modifiers.h"
@@ -87,18 +88,17 @@ static auto MergeFunctionRedecl(Context& context, SemIRLoc new_loc,
prev_function.definition_id.is_valid()),
prev_import_ir_id);
if (!prev_function.first_owning_decl_id.is_valid()) {
prev_function.first_owning_decl_id = new_function.first_owning_decl_id;
}
if (new_is_definition) {
// Track the signature from the definition, so that IDs in the body
// match IDs in the signature.
prev_function.MergeDefinition(new_function);
prev_function.return_storage_id = new_function.return_storage_id;
}
// The new function might have return slot information if it was imported.
if ((prev_import_ir_id.is_valid() && !new_is_import) ||
(prev_function.is_extern && !new_function.is_extern)) {
prev_function.is_extern = new_function.is_extern;
prev_function.first_owning_decl_id = new_function.first_owning_decl_id;
ReplacePrevInstForMerge(context, prev_function.parent_scope_id,
if ((prev_import_ir_id.is_valid() && !new_is_import)) {
ReplacePrevInstForMerge(context, new_function.parent_scope_id,
prev_function.name_id,
new_function.first_owning_decl_id);
}
@@ -122,9 +122,9 @@ static auto TryMergeRedecl(Context& context, Parse::AnyFunctionDeclId node_id,
prev_function_id = function_decl.function_id;
break;
}
case CARBON_KIND(SemIR::ImportRefLoaded import_ref): {
case SemIR::ImportRefLoaded::Kind: {
auto import_ir_inst =
context.import_ir_insts().Get(import_ref.import_ir_inst_id);
GetCanonicalImportIRInst(context, &context.sem_ir(), prev_id);
// Verify the decl so that things like aliases are name conflicts.
const auto* import_ir =
@@ -226,6 +226,9 @@ static auto BuildFunctionDecl(Context& context,
// Create a new function if this isn't a valid redeclaration.
if (!function_decl.function_id.is_valid()) {
if (function_info.is_extern && context.IsImplFile()) {
DiagnoseExternRequiresDeclInApiFile(context, node_id);
}
function_info.generic_id = FinishGenericDecl(context, decl_id);
function_decl.function_id = context.functions().Add(function_info);
} else {