Repository: carbon-language/carbon-lang
File: toolchain/check/import.cpp (C++)

Code before:
      {.name_id = name_id, .parent_scope_id = parent_scope_id});
    auto import_ref = AddImportRef(context, {.ir_id = ir_id, .inst_id = import_inst_id},
      entity_name_id);
    entry.result = SemIR::ScopeLookupResult::MakeFound( import_ref,
      SemIR::AccessKind::Public);

    // Import references for non-owning declarations that match current library
    const auto functions = import_sem_ir.get_non_owning_functions();
    auto current_id = context.sem_ir().library_id();
    bool is_current_default = current_id == SemIR::LibraryNameId::Default;
    for (auto function_id : functions) {
      const auto& function = import_sem_ir.functions().Get(function_id);
      auto lib_id = function.extern_library_id;
      bool is_lib_default = lib_id == SemIR::LibraryNameId::Default;

      if ((is_lib_default && is_current_default) ||
          (!is_lib_default && !is_current_default)) {
        if (is_lib_default) {  // both libraries are default, import ref.
          LoadImportRef(context, import_ref);
        } else {
          // both libraries are non-default, check if they're the same named
          // library, import ref if yes.
          StringLiteralValueId owner_library =
              current_id.AsStringLiteralValueId();
          auto str_owner_library =
              context.string_literal_values().Get(owner_library);
          StringLiteralValueId decl_library = lib_id.AsStringLiteralValueId();
          auto str_decl_library =
              import_sem_ir.string_literal_values().Get(decl_library);
          if (str_owner_library.compare(str_decl_library) == 0) {
            LoadImportRef(context, import_ref);
          }
        }
      }
    }
    return;
  }

  auto inst_id = entry.result.target_inst_id();
  auto prev_ir_inst = GetCanonicalImportIRInst(context, inst_id);
  VerifySameCanonicalImportIRInst(context, inst_id, prev_ir_inst, ir_id,
                                  &import_sem_ir, import_inst_id);
}

namespace {
// A scope in the API file that still needs to be copied to the implementation
// file. Only used for API file imports.
struct TodoScope {
  // The scope's instruction in the API file.
  SemIR::InstId api_inst_id;
  // The scope in the API file.

Review comment (suggestion):
```suggestion
          auto str_owner_library =
              context.string_literal_values().Get(current_id.AsStringLiteralValueId());
```

Very minor nit, but might consider inlining variables a little more. :)

Code after:
  }
  CARBON_CHECK(function.is_extern && "Expected extern functions");
  auto lib_id = function.extern_library_id;
  bool is_lib_default = lib_id == SemIR::LibraryNameId::Default;

  auto current_id = context.sem_ir().library_id();
  bool is_current_default = current_id == SemIR::LibraryNameId::Default;

  if (is_lib_default == is_current_default) {
    if (is_lib_default) {
      // Both libraries are default, import ref.
      LoadImportRef(context, import_ref);
    } else {
      // Both libraries are non-default: check if they're the same named
      // library, import ref if yes.
      auto str_owner_library = context.string_literal_values().Get(
          current_id.AsStringLiteralValueId());
      auto str_decl_library = import_sem_ir.string_literal_values().Get(
          lib_id.AsStringLiteralValueId());
      if (str_owner_library == str_decl_library) {
        LoadImportRef(context, import_ref);
      }
    }
  }
}

// Adds an ImportRef for an entity, handling merging if needed.
static auto AddImportRefOrMerge(Context& context, SemIR::ImportIRId ir_id,
                                const SemIR::File& import_sem_ir,
                                SemIR::InstId import_inst_id,
                                SemIR::NameScopeId parent_scope_id,
                                SemIR::NameId name_id) -> void {
  // Leave a placeholder that the inst comes from the other IR.
  auto& parent_scope = context.name_scopes().Get(parent_scope_id);
  auto [inserted, entry_id] = parent_scope.LookupOrAdd(
      name_id,
      // This InstId is temporary and would be overridden if used.
      SemIR::InstId::None, SemIR::AccessKind::Public);
  auto& entry = parent_scope.GetEntry(entry_id);
  if (inserted) {
    auto entity_name_id = context.entity_names().Add(
        {.name_id = name_id, .parent_scope_id = parent_scope_id});
    auto import_ref = AddImportRef(
        context, {.ir_id = ir_id, .inst_id = import_inst_id}, entity_name_id);
    entry.result = SemIR::ScopeLookupResult::MakeFound(
        import_ref, SemIR::AccessKind::Public);

    // Import references for non-owning declarations that match current library.
    if (auto function_decl =
            import_sem_ir.insts().TryGetAs<SemIR::FunctionDecl>(
                import_inst_id)) {