diff --git a/toolchain/base/value_store.h b/toolchain/base/value_store.h index 69355daef5fa..cfd3da7d807d 100644 --- a/toolchain/base/value_store.h +++ b/toolchain/base/value_store.h @@ -146,13 +146,13 @@ class ValueStore // Returns a mutable value for an ID. auto Get(IdT id) -> ValueType& { - CARBON_CHECK(id.index >= 0) << id.index; + CARBON_CHECK(id.index >= 0) << id; return values_[id.index]; } // Returns the value for an ID. auto Get(IdT id) const -> const ValueType& { - CARBON_CHECK(id.index >= 0) << id.index; + CARBON_CHECK(id.index >= 0) << id; return values_[id.index]; } diff --git a/toolchain/check/BUILD b/toolchain/check/BUILD index 42b5d2012e3e..0a1e995578c3 100644 --- a/toolchain/check/BUILD +++ b/toolchain/check/BUILD @@ -89,6 +89,7 @@ cc_library( "//toolchain/sem_ir:ids", "//toolchain/sem_ir:inst", "//toolchain/sem_ir:inst_kind", + "//toolchain/sem_ir:value_stores", "@llvm-project//llvm:Support", ], ) diff --git a/toolchain/check/check.cpp b/toolchain/check/check.cpp index 96cc1702d54b..9e830e09f6ec 100644 --- a/toolchain/check/check.cpp +++ b/toolchain/check/check.cpp @@ -10,11 +10,14 @@ #include "toolchain/check/context.h" #include "toolchain/diagnostics/diagnostic_emitter.h" #include "toolchain/lex/token_kind.h" +#include "toolchain/parse/node_ids.h" #include "toolchain/parse/tree.h" #include "toolchain/parse/tree_node_location_translator.h" #include "toolchain/sem_ir/file.h" #include "toolchain/sem_ir/ids.h" +#include "toolchain/sem_ir/inst.h" #include "toolchain/sem_ir/typed_insts.h" +#include "toolchain/sem_ir/value_stores.h" namespace Carbon::Check { @@ -74,46 +77,169 @@ struct UnitInfo { llvm::SmallVector incoming_imports; }; -// Returns the NameId for the entity. May return Invalid for a TODO. -// TODO: This will need to handle enclosing namespaces. -static auto GetImportNameId(Parse::NodeId parse_node, Context& context, - const SemIR::File& import_sem_ir, - SemIR::InstId import_inst_id) -> SemIR::NameId { - auto import_inst = import_sem_ir.insts().Get(import_inst_id); - +// Returns name information for the entity, corresponding to IDs in the import +// IR rather than the current IR. May return Invalid for a TODO. +static auto GetImportName(Parse::NodeId parse_node, Context& context, + const SemIR::File& import_sem_ir, + SemIR::Inst import_inst) + -> std::pair { switch (import_inst.kind()) { case SemIR::InstKind::BindName: { - auto bind_name = import_inst.As(); - return import_sem_ir.bind_names().Get(bind_name.bind_name_id).name_id; + const auto& bind_name = import_sem_ir.bind_names().Get( + import_inst.As().bind_name_id); + return {bind_name.name_id, bind_name.enclosing_scope_id}; } case SemIR::InstKind::FunctionDecl: { - auto bind_name = import_inst.As(); - return import_sem_ir.functions().Get(bind_name.function_id).name_id; + const auto& function = import_sem_ir.functions().Get( + import_inst.As().function_id); + return {function.name_id, function.enclosing_scope_id}; + } + + case SemIR::InstKind::Namespace: { + auto namespace_inst = import_inst.As(); + const auto& scope = + import_sem_ir.name_scopes().Get(namespace_inst.name_scope_id); + return {namespace_inst.name_id, scope.enclosing_scope_id}; } default: - context.TODO(parse_node, (llvm::Twine("Support GetImportNameId of ") + + context.TODO(parse_node, (llvm::Twine("Support GetImportName of ") + import_inst.kind().name()) .str()); - return SemIR::NameId::Invalid; + return {SemIR::NameId::Invalid, SemIR::NameScopeId::Invalid}; } } +// Translate the name to the current IR. It will usually be an identifier, but +// could also be a builtin name ID which is equivalent cross-IR. +static auto CopyNameFromImportIR(Context& context, + const SemIR::File& import_sem_ir, + SemIR::NameId import_name_id) { + if (auto import_identifier_id = import_name_id.AsIdentifierId(); + import_identifier_id.is_valid()) { + auto name = import_sem_ir.identifiers().Get(import_identifier_id); + return SemIR::NameId::ForIdentifier(context.identifiers().Add(name)); + } + return import_name_id; +} + +// Creates a namespace. The type ID is builtin, and reused to avoid duplicative +// canonicalization. +static auto AddNamespace(Context& context, + SemIR::NameScopeId enclosing_scope_id, + SemIR::NameId name_id, SemIR::TypeId namespace_type_id) + -> std::pair { + // Use the invalid node because there's no node to associate with. + auto inst = SemIR::Namespace{Parse::NodeId::Invalid, namespace_type_id, + name_id, SemIR::NameScopeId::Invalid}; + auto id = context.AddInst(inst); + inst.name_scope_id = context.name_scopes().Add(id, enclosing_scope_id); + context.insts().Set(id, inst); + return {id, inst.name_scope_id}; +} + +static auto CacheCopiedNamespace( + llvm::DenseMap& copied_namespaces, + SemIR::NameScopeId import_scope_id, SemIR::NameScopeId to_scope_id) + -> void { + auto [it, success] = copied_namespaces.insert({import_scope_id, to_scope_id}); + CARBON_CHECK(success || it->second == to_scope_id) + << "Copy result for namespace changed from " << import_scope_id << " to " + << to_scope_id; +} + +// Copies enclosing name scopes from the import IR. Handles the parent +// traversal. Returns the NameScope corresponding to the copied +// import_enclosing_scope_id. +static auto CopyEnclosingNameScopeFromImportIR( + Context& context, SemIR::TypeId namespace_type_id, + const SemIR::File& import_sem_ir, + SemIR::NameScopeId import_enclosing_scope_id, + llvm::DenseMap& copied_namespaces) + -> SemIR::NameScopeId { + // Package-level names don't need work. + if (import_enclosing_scope_id == SemIR::NameScopeId::Package) { + return import_enclosing_scope_id; + } + + // The scope to add namespaces to. Note this may change while looking at + // enclosing scopes, if we encounter a namespace that's already added. + auto scope_cursor = SemIR::NameScopeId::Package; + + // Build a stack of enclosing namespace names, with innermost first. + llvm::SmallVector> + new_namespaces; + while (import_enclosing_scope_id != SemIR::NameScopeId::Package) { + // If the namespace was already copied, reuse the results. + if (auto it = copied_namespaces.find(import_enclosing_scope_id); + it != copied_namespaces.end()) { + // We inject names at the provided scope, and don't need to keep + // traversing parents. + scope_cursor = it->second; + break; + } + + // The namespace hasn't been copied yet, so add it to our list. + const auto& scope = + import_sem_ir.name_scopes().Get(import_enclosing_scope_id); + auto scope_inst = + import_sem_ir.insts().GetAs(scope.inst_id); + new_namespaces.push_back({scope_inst.name_scope_id, scope_inst.name_id}); + import_enclosing_scope_id = scope.enclosing_scope_id; + } + + // Add enclosing namespace names, starting with the outermost. + for (auto import_namespace : llvm::reverse(new_namespaces)) { + auto name_id = + CopyNameFromImportIR(context, import_sem_ir, import_namespace.second); + auto& scope = context.name_scopes().Get(scope_cursor); + auto [it, success] = scope.names.insert({name_id, SemIR::InstId::Invalid}); + if (!success) { + auto inst = context.insts().Get(it->second); + if (auto namespace_inst = inst.TryAs()) { + // Namespaces are open, so we can append to the existing one even if it + // comes from a different file. + scope_cursor = namespace_inst->name_scope_id; + CacheCopiedNamespace(copied_namespaces, import_namespace.first, + scope_cursor); + continue; + } + // Produce a diagnostic, but still produce the namespace to supersede the + // name conflict in order to avoid repeat diagnostics. + // TODO: Produce a diagnostic. + } + + // Produce the namespace for the entry. + auto [namespace_id, name_scope_id] = + AddNamespace(context, scope_cursor, name_id, namespace_type_id); + + it->second = namespace_id; + scope_cursor = name_scope_id; + CacheCopiedNamespace(copied_namespaces, import_namespace.first, + scope_cursor); + } + + return scope_cursor; +} + // Add imports to the root block. static auto InitPackageScopeAndImports(Context& context, UnitInfo& unit_info) -> void { + // Importing makes many namespaces, so only canonicalize the type once. + auto namespace_type_id = + context.GetBuiltinType(SemIR::BuiltinKind::NamespaceType); + // Define the package scope, with an instruction for `package` expressions to // reference. - auto package_scope_id = - context.name_scopes().Add(SemIR::InstId::PackageNamespace); + auto package_scope_id = context.name_scopes().Add( + SemIR::InstId::PackageNamespace, SemIR::NameScopeId::Invalid); CARBON_CHECK(package_scope_id == SemIR::NameScopeId::Package); - auto package_inst = context.AddInst(SemIR::Namespace{ - Parse::NodeId::Invalid, - context.GetBuiltinType(SemIR::BuiltinKind::NamespaceType), - SemIR::NameScopeId::Package}); - CARBON_CHECK(package_inst == SemIR::InstId::PackageNamespace); + auto package_inst_id = context.AddInst(SemIR::Namespace{ + Parse::NodeId::Invalid, namespace_type_id, + SemIR::NameId::PackageNamespace, SemIR::NameScopeId::Package}); + CARBON_CHECK(package_inst_id == SemIR::InstId::PackageNamespace); // Add imports from the current package. auto self_import = unit_info.package_imports_map.find(IdentifierId::Invalid); @@ -133,39 +259,56 @@ static auto InitPackageScopeAndImports(Context& context, UnitInfo& unit_info) auto ir_id = context.sem_ir().cross_ref_irs().Add(&import_sem_ir); + llvm::DenseMap copied_namespaces; for (const auto import_inst_id : import_sem_ir.inst_blocks().Get(SemIR::InstBlockId::Exports)) { - // TODO: Handle enclosing namespaces. - auto name_id = GetImportNameId(self_import->second.node, context, - import_sem_ir, import_inst_id); - - // Translate the name to the current IR. It will usually be an - // identifier, but could also be a builtin name ID which is - // equivalent cross-IR. - if (auto import_identifier_id = name_id.AsIdentifierId(); - import_identifier_id.is_valid()) { - auto name = import_sem_ir.identifiers().Get(import_identifier_id); - name_id = - SemIR::NameId::ForIdentifier(context.identifiers().Add(name)); + auto import_inst = import_sem_ir.insts().Get(import_inst_id); + auto [import_name_id, import_enclosing_scope_id] = GetImportName( + self_import->second.node, context, import_sem_ir, import_inst); + // TODO: This should only be invalid when GetImportName for an inst + // isn't yet implemented. Long-term this should be removed. + if (!import_name_id.is_valid()) { + continue; } - // Leave a placeholder that the inst comes from the other IR. - auto target_id = context.AddInst( - SemIR::LazyImportRef{.ir_id = ir_id, .inst_id = import_inst_id}); - // TODO: When importing from other packages, the scope's names should be - // changed to allow for ambiguous names. When importing from the current - // package, as is currently being done, we should issue a diagnostic on - // conflicts. - package_scope.names.insert({name_id, target_id}); + auto name_id = + CopyNameFromImportIR(context, import_sem_ir, import_name_id); + SemIR::NameScopeId enclosing_scope_id = + CopyEnclosingNameScopeFromImportIR( + context, namespace_type_id, import_sem_ir, + import_enclosing_scope_id, copied_namespaces); + + if (auto import_namespace_inst = + import_inst.TryAs()) { + // Namespaces are always imported because they're essential for + // qualifiers, and the type is simple. + auto [namespace_id, name_scope_id] = AddNamespace( + context, enclosing_scope_id, name_id, namespace_type_id); + context.name_scopes().AddEntry(enclosing_scope_id, name_id, + namespace_id); + CacheCopiedNamespace(copied_namespaces, + import_namespace_inst->name_scope_id, + name_scope_id); + } else { + // Leave a placeholder that the inst comes from the other IR. + auto target_id = context.AddInst( + SemIR::LazyImportRef{.ir_id = ir_id, .inst_id = import_inst_id}); + // TODO: When importing from other packages, the scope's names should + // be changed to allow for ambiguous names. When importing from the + // current package, as is currently being done, we should issue a + // diagnostic on conflicts. + context.name_scopes().AddEntry(enclosing_scope_id, name_id, + target_id); + } } } // Push the scope. - context.PushScope(package_inst, SemIR::NameScopeId::Package, + context.PushScope(package_inst_id, SemIR::NameScopeId::Package, package_scope.has_error); } else { // Push the scope; there are no names to add. - context.PushScope(package_inst, SemIR::NameScopeId::Package); + context.PushScope(package_inst_id, SemIR::NameScopeId::Package); } for (auto& [package_id, package_imports] : unit_info.package_imports_map) { diff --git a/toolchain/check/context.cpp b/toolchain/check/context.cpp index 9a7506b7175d..d18093c12a03 100644 --- a/toolchain/check/context.cpp +++ b/toolchain/check/context.cpp @@ -181,6 +181,7 @@ auto Context::ResolveIfLazyImportRef(SemIR::InstId inst_id) -> void { // TODO: Fill this in better. auto function_id = functions().Add({.name_id = SemIR::NameId::Invalid, + .enclosing_scope_id = SemIR::NameScopeId::Invalid, .decl_id = inst_id, .implicit_param_refs_id = SemIR::InstBlockId::Empty, .param_refs_id = SemIR::InstBlockId::Empty, diff --git a/toolchain/check/decl_name_stack.h b/toolchain/check/decl_name_stack.h index a56a4f039f58..3b9499a7e15b 100644 --- a/toolchain/check/decl_name_stack.h +++ b/toolchain/check/decl_name_stack.h @@ -104,6 +104,22 @@ class DeclNameStack { Error, }; + // Returns the name_id for a new instruction. This is invalid when the name + // resolved. + auto name_id_for_new_inst() -> SemIR::NameId { + return state == State::Unresolved ? unresolved_name_id + : SemIR::NameId::Invalid; + } + + // Returns the enclosing_scope_id for a new instruction. This is invalid + // when the name resolved. Note this is distinct from the enclosing_scope of + // the NameContext, which refers to the scope of the introducer rather than + // the scope of the name. + auto enclosing_scope_id_for_new_inst() -> SemIR::NameScopeId { + return state == State::Unresolved ? target_scope_id + : SemIR::NameScopeId::Invalid; + } + // The current scope when this name began. This is the scope that we will // return to at the end of the declaration. ScopeIndex enclosing_scope; diff --git a/toolchain/check/handle_binding_pattern.cpp b/toolchain/check/handle_binding_pattern.cpp index d050eaef761c..ad6c5048d15a 100644 --- a/toolchain/check/handle_binding_pattern.cpp +++ b/toolchain/check/handle_binding_pattern.cpp @@ -25,10 +25,10 @@ auto HandleAnyBindingPattern(Context& context, Parse::NodeId parse_node, auto make_bind_name = [&, name_node = name_node, name_id = name_id]( SemIR::TypeId type_id, SemIR::InstId value_id) -> SemIR::Inst { - // TODO: Set the correct enclosing_scope_id. + // TODO: Eventually the name will need to support associations with other + // scopes, but right now we don't support qualified names here. auto bind_name_id = context.bind_names().Add( - {.name_id = name_id, - .enclosing_scope_id = SemIR::NameScopeId::Invalid}); + {.name_id = name_id, .enclosing_scope_id = context.current_scope_id()}); if (is_generic) { // TODO: Create a `BindTemplateName` instead inside a `template` pattern. return SemIR::BindSymbolicName{name_node, type_id, bind_name_id, diff --git a/toolchain/check/handle_class.cpp b/toolchain/check/handle_class.cpp index 367361607051..9e273bee7fcf 100644 --- a/toolchain/check/handle_class.cpp +++ b/toolchain/check/handle_class.cpp @@ -93,10 +93,8 @@ static auto BuildClassDecl(Context& context, Parse::AnyClassDeclId parse_node) // was an error in the qualifier, we will have lost track of the class name // here. We should keep track of it even if the name is invalid. class_decl.class_id = context.classes().Add( - {.name_id = - name_context.state == DeclNameStack::NameContext::State::Unresolved - ? name_context.unresolved_name_id - : SemIR::NameId::Invalid, + {.name_id = name_context.name_id_for_new_inst(), + .enclosing_scope_id = name_context.enclosing_scope_id_for_new_inst(), // `.self_type_id` depends on `class_id`, so is set below. .self_type_id = SemIR::TypeId::Invalid, .decl_id = class_decl_id, @@ -142,7 +140,8 @@ auto HandleClassDefinitionStart(Context& context, .Emit(); } else { class_info.definition_id = class_decl_id; - class_info.scope_id = context.name_scopes().Add(class_decl_id); + class_info.scope_id = + context.name_scopes().Add(class_decl_id, class_info.enclosing_scope_id); } // Enter the class scope. diff --git a/toolchain/check/handle_function.cpp b/toolchain/check/handle_function.cpp index 26c29b3f4434..de7d30738884 100644 --- a/toolchain/check/handle_function.cpp +++ b/toolchain/check/handle_function.cpp @@ -4,9 +4,11 @@ #include "toolchain/check/context.h" #include "toolchain/check/convert.h" +#include "toolchain/check/decl_name_stack.h" #include "toolchain/check/modifiers.h" #include "toolchain/parse/tree_node_location_translator.h" #include "toolchain/sem_ir/entry_point.h" +#include "toolchain/sem_ir/ids.h" namespace Carbon::Check { @@ -169,10 +171,8 @@ static auto BuildFunctionDecl(Context& context, // Create a new function if this isn't a valid redeclaration. if (!function_decl.function_id.is_valid()) { function_decl.function_id = context.functions().Add( - {.name_id = - name_context.state == DeclNameStack::NameContext::State::Unresolved - ? name_context.unresolved_name_id - : SemIR::NameId::Invalid, + {.name_id = name_context.name_id_for_new_inst(), + .enclosing_scope_id = name_context.enclosing_scope_id_for_new_inst(), .decl_id = function_decl_id, .implicit_param_refs_id = implicit_param_refs_id, .param_refs_id = param_refs_id, diff --git a/toolchain/check/handle_interface.cpp b/toolchain/check/handle_interface.cpp index 4af9dd49b6d0..95f9d7c35127 100644 --- a/toolchain/check/handle_interface.cpp +++ b/toolchain/check/handle_interface.cpp @@ -76,10 +76,8 @@ static auto BuildInterfaceDecl(Context& context, // invalid. // TODO: should have a `Self` type id member interface_decl.interface_id = context.interfaces().Add( - {.name_id = - name_context.state == DeclNameStack::NameContext::State::Unresolved - ? name_context.unresolved_name_id - : SemIR::NameId::Invalid, + {.name_id = name_context.name_id_for_new_inst(), + .enclosing_scope_id = name_context.enclosing_scope_id_for_new_inst(), .decl_id = interface_decl_id}); } @@ -116,7 +114,8 @@ auto HandleInterfaceDefinitionStart( .Emit(); } else { interface_info.definition_id = interface_decl_id; - interface_info.scope_id = context.name_scopes().Add(interface_decl_id); + interface_info.scope_id = context.name_scopes().Add( + interface_decl_id, interface_info.enclosing_scope_id); } // Enter the interface scope. diff --git a/toolchain/check/handle_namespace.cpp b/toolchain/check/handle_namespace.cpp index a363c7c35005..b11894149a90 100644 --- a/toolchain/check/handle_namespace.cpp +++ b/toolchain/check/handle_namespace.cpp @@ -24,9 +24,10 @@ auto HandleNamespace(Context& context, Parse::NamespaceId parse_node) -> bool { Lex::TokenKind::Namespace); auto namespace_inst = SemIR::Namespace{ parse_node, context.GetBuiltinType(SemIR::BuiltinKind::NamespaceType), - SemIR::NameScopeId::Invalid}; + name_context.name_id_for_new_inst(), SemIR::NameScopeId::Invalid}; auto namespace_id = context.AddInst(namespace_inst); - namespace_inst.name_scope_id = context.name_scopes().Add(namespace_id); + namespace_inst.name_scope_id = context.name_scopes().Add( + namespace_id, name_context.enclosing_scope_id_for_new_inst()); context.insts().Set(namespace_id, namespace_inst); context.decl_name_stack().AddNameToLookup(name_context, namespace_id); diff --git a/toolchain/check/testdata/array/array_in_place.carbon b/toolchain/check/testdata/array/array_in_place.carbon index 5fcb51d71dee..c3a44b10b911 100644 --- a/toolchain/check/testdata/array/array_in_place.carbon +++ b/toolchain/check/testdata/array/array_in_place.carbon @@ -21,7 +21,7 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/assign_return_value.carbon b/toolchain/check/testdata/array/assign_return_value.carbon index 83acaf531c12..7d9eb4db9dde 100644 --- a/toolchain/check/testdata/array/assign_return_value.carbon +++ b/toolchain/check/testdata/array/assign_return_value.carbon @@ -19,7 +19,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .Run = %Run} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/assign_var.carbon b/toolchain/check/testdata/array/assign_var.carbon index f3e6c46a62ca..76a747dd2225 100644 --- a/toolchain/check/testdata/array/assign_var.carbon +++ b/toolchain/check/testdata/array/assign_var.carbon @@ -17,7 +17,7 @@ var b: [i32; 3] = a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} // CHECK:STDOUT: %.loc7_22.1: (type, type, type) = tuple_literal (i32, i32, i32) // CHECK:STDOUT: %.loc7_22.2: type = converted %.loc7_22.1, constants.%.loc7_22.2 // CHECK:STDOUT: %a.var: ref (i32, i32, i32) = var a diff --git a/toolchain/check/testdata/array/base.carbon b/toolchain/check/testdata/array/base.carbon index e35ec8fe4c7c..adc17d505555 100644 --- a/toolchain/check/testdata/array/base.carbon +++ b/toolchain/check/testdata/array/base.carbon @@ -21,7 +21,7 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c} // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/array/fail_bound_overflow.carbon b/toolchain/check/testdata/array/fail_bound_overflow.carbon index 90845df04984..98adcbe50cb1 100644 --- a/toolchain/check/testdata/array/fail_bound_overflow.carbon +++ b/toolchain/check/testdata/array/fail_bound_overflow.carbon @@ -12,7 +12,7 @@ var a: [1; 39999999999999999993]; // CHECK:STDOUT: --- fail_bound_overflow.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} +// CHECK:STDOUT: package: = namespace package, {.a = %a} // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_12: i32 = int_literal 39999999999999999993 // CHECK:STDOUT: %a.var: ref = var a diff --git a/toolchain/check/testdata/array/fail_incomplete_element.carbon b/toolchain/check/testdata/array/fail_incomplete_element.carbon index 883507f3b65a..d86acf0fb69d 100644 --- a/toolchain/check/testdata/array/fail_incomplete_element.carbon +++ b/toolchain/check/testdata/array/fail_incomplete_element.carbon @@ -26,7 +26,7 @@ var p: Incomplete* = &a[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Incomplete = %Incomplete.decl, .a = %a, .p = %p} +// CHECK:STDOUT: package: = namespace package, {.Incomplete = %Incomplete.decl, .a = %a, .p = %p} // CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete, () // CHECK:STDOUT: %Incomplete: type = class_type @Incomplete // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete diff --git a/toolchain/check/testdata/array/fail_invalid_type.carbon b/toolchain/check/testdata/array/fail_invalid_type.carbon index 1697eb8a5cd6..16abf73a1e78 100644 --- a/toolchain/check/testdata/array/fail_invalid_type.carbon +++ b/toolchain/check/testdata/array/fail_invalid_type.carbon @@ -16,7 +16,7 @@ var a: [1; 1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} +// CHECK:STDOUT: package: = namespace package, {.a = %a} // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_12: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_13: type = array_type %.loc10_12, diff --git a/toolchain/check/testdata/array/fail_out_of_bound.carbon b/toolchain/check/testdata/array/fail_out_of_bound.carbon index c8167cf8c6b5..448c78e54f08 100644 --- a/toolchain/check/testdata/array/fail_out_of_bound.carbon +++ b/toolchain/check/testdata/array/fail_out_of_bound.carbon @@ -17,7 +17,7 @@ var a: [i32; 1] = (1, 2, 3); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} +// CHECK:STDOUT: package: = namespace package, {.a = %a} // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/array/fail_type_mismatch.carbon b/toolchain/check/testdata/array/fail_type_mismatch.carbon index ac7582c14446..7195fb433bea 100644 --- a/toolchain/check/testdata/array/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/array/fail_type_mismatch.carbon @@ -41,7 +41,7 @@ var d: [i32; 3] = t2; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .t1 = %t1, .b = %b, .c = %c, .t2 = %t2, .d = %d} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .t1 = %t1, .b = %b, .c = %c, .t2 = %t2, .d = %d} // CHECK:STDOUT: %.loc10_14: i32 = int_literal 3 // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 3] = var a diff --git a/toolchain/check/testdata/array/function_param.carbon b/toolchain/check/testdata/array/function_param.carbon index fe5db0f07388..c40cec4c2713 100644 --- a/toolchain/check/testdata/array/function_param.carbon +++ b/toolchain/check/testdata/array/function_param.carbon @@ -20,7 +20,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/nine_elements.carbon b/toolchain/check/testdata/array/nine_elements.carbon index 785a0c341a4d..a98a2bea05fe 100644 --- a/toolchain/check/testdata/array/nine_elements.carbon +++ b/toolchain/check/testdata/array/nine_elements.carbon @@ -14,7 +14,7 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} +// CHECK:STDOUT: package: = namespace package, {.a = %a} // CHECK:STDOUT: %.loc7_14: i32 = int_literal 9 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 9] = var a diff --git a/toolchain/check/testdata/as/as_type.carbon b/toolchain/check/testdata/as/as_type.carbon index 7e4907392c42..e1cae0fc9549 100644 --- a/toolchain/check/testdata/as/as_type.carbon +++ b/toolchain/check/testdata/as/as_type.carbon @@ -14,7 +14,7 @@ let t: type = (i32, i32) as type; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %.loc7_24: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_26: type = converted %.loc7_24, constants.%.loc7_26 // CHECK:STDOUT: %t: type = bind_name t, %.loc7_26 diff --git a/toolchain/check/testdata/as/basic.carbon b/toolchain/check/testdata/as/basic.carbon index 6323567e4418..77ede8a8788c 100644 --- a/toolchain/check/testdata/as/basic.carbon +++ b/toolchain/check/testdata/as/basic.carbon @@ -11,7 +11,7 @@ fn Main() -> i32 { // CHECK:STDOUT: --- basic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/fail_no_conversion.carbon b/toolchain/check/testdata/as/fail_no_conversion.carbon index 0eba7d187f6f..ac27d6070a57 100644 --- a/toolchain/check/testdata/as/fail_no_conversion.carbon +++ b/toolchain/check/testdata/as/fail_no_conversion.carbon @@ -18,7 +18,7 @@ let n: (i32, i32) = 1 as (i32, i32); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.loc10_17.2 // CHECK:STDOUT: %.loc10_21: i32 = int_literal 1 diff --git a/toolchain/check/testdata/as/fail_not_type.carbon b/toolchain/check/testdata/as/fail_not_type.carbon index 4864a2fc95db..fa938271d980 100644 --- a/toolchain/check/testdata/as/fail_not_type.carbon +++ b/toolchain/check/testdata/as/fail_not_type.carbon @@ -12,7 +12,7 @@ let n: i32 = 1 as 2; // CHECK:STDOUT: --- fail_not_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_19: i32 = int_literal 2 // CHECK:STDOUT: %n: i32 = bind_name n, diff --git a/toolchain/check/testdata/as/identity.carbon b/toolchain/check/testdata/as/identity.carbon index 951a2807a3f8..5d1431f4d98d 100644 --- a/toolchain/check/testdata/as/identity.carbon +++ b/toolchain/check/testdata/as/identity.carbon @@ -33,7 +33,7 @@ fn Initializing() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.X = %X.decl, .Value = %Value, .Reference = %Reference, .Make = %Make, .Initializing = %Initializing} +// CHECK:STDOUT: package: = namespace package, {.X = %X.decl, .Value = %Value, .Reference = %Reference, .Make = %Make, .Initializing = %Initializing} // CHECK:STDOUT: %X.decl = class_decl @X, () // CHECK:STDOUT: %X: type = class_type @X // CHECK:STDOUT: %Value: = fn_decl @Value diff --git a/toolchain/check/testdata/as/tuple.carbon b/toolchain/check/testdata/as/tuple.carbon index 9e6eed853386..6597c9f608d3 100644 --- a/toolchain/check/testdata/as/tuple.carbon +++ b/toolchain/check/testdata/as/tuple.carbon @@ -33,7 +33,7 @@ fn Var() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.X = %X.decl, .Make = %Make, .Let = %Let, .Var = %Var} +// CHECK:STDOUT: package: = namespace package, {.X = %X.decl, .Make = %Make, .Let = %Let, .Var = %Var} // CHECK:STDOUT: %X.decl = class_decl @X, () // CHECK:STDOUT: %X: type = class_type @X // CHECK:STDOUT: %Make: = fn_decl @Make diff --git a/toolchain/check/testdata/basics/builtin_insts.carbon b/toolchain/check/testdata/basics/builtin_insts.carbon index f784f9d119b0..3a304621ab77 100644 --- a/toolchain/check/testdata/basics/builtin_insts.carbon +++ b/toolchain/check/testdata/basics/builtin_insts.carbon @@ -10,6 +10,8 @@ // CHECK:STDOUT: filename: builtin_insts.carbon // CHECK:STDOUT: sem_ir: // CHECK:STDOUT: cross_ref_irs_size: 1 +// CHECK:STDOUT: name_scopes: +// CHECK:STDOUT: name_scope0: {inst: inst+0, enclosing_scope: name_scope, has_error: false, extended_scopes: [], names: {}} // CHECK:STDOUT: bind_names: {} // CHECK:STDOUT: functions: {} // CHECK:STDOUT: classes: {} @@ -26,7 +28,7 @@ // CHECK:STDOUT: instFunctionType: {kind: CrossRef, arg0: ir0, arg1: instFunctionType, type: typeTypeType} // CHECK:STDOUT: instBoundMethodType: {kind: CrossRef, arg0: ir0, arg1: instBoundMethodType, type: typeTypeType} // CHECK:STDOUT: instNamespaceType: {kind: CrossRef, arg0: ir0, arg1: instNamespaceType, type: typeTypeType} -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} // CHECK:STDOUT: inst_blocks: // CHECK:STDOUT: empty: {} // CHECK:STDOUT: exports: {} diff --git a/toolchain/check/testdata/basics/builtin_types.carbon b/toolchain/check/testdata/basics/builtin_types.carbon index 49c95eaf84a0..7fb75ca34a68 100644 --- a/toolchain/check/testdata/basics/builtin_types.carbon +++ b/toolchain/check/testdata/basics/builtin_types.carbon @@ -16,7 +16,7 @@ var test_type: type = i32; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.test_i32 = %test_i32, .test_f64 = %test_f64, .test_type = %test_type} +// CHECK:STDOUT: package: = namespace package, {.test_i32 = %test_i32, .test_f64 = %test_f64, .test_type = %test_type} // CHECK:STDOUT: %test_i32.var: ref i32 = var test_i32 // CHECK:STDOUT: %test_i32: ref i32 = bind_name test_i32, %test_i32.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 diff --git a/toolchain/check/testdata/basics/empty.carbon b/toolchain/check/testdata/basics/empty.carbon index 47c2f090f6f6..c663d866f61d 100644 --- a/toolchain/check/testdata/basics/empty.carbon +++ b/toolchain/check/testdata/basics/empty.carbon @@ -7,6 +7,6 @@ // CHECK:STDOUT: --- empty.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/empty_decl.carbon b/toolchain/check/testdata/basics/empty_decl.carbon index 3bbe888bf953..26f9cb0a0d08 100644 --- a/toolchain/check/testdata/basics/empty_decl.carbon +++ b/toolchain/check/testdata/basics/empty_decl.carbon @@ -9,6 +9,6 @@ // CHECK:STDOUT: --- empty_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_bad_run.carbon b/toolchain/check/testdata/basics/fail_bad_run.carbon index 3dda82d08e79..90c0baeb4975 100644 --- a/toolchain/check/testdata/basics/fail_bad_run.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run.carbon @@ -20,7 +20,7 @@ fn Run() -> String {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Run = %Run} // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_bad_run_2.carbon b/toolchain/check/testdata/basics/fail_bad_run_2.carbon index 6020efa45c07..bcdee445a15c 100644 --- a/toolchain/check/testdata/basics/fail_bad_run_2.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run_2.carbon @@ -12,7 +12,7 @@ fn Run(n: i32) {} // CHECK:STDOUT: --- fail_bad_run_2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Run = %Run} // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_name_lookup.carbon b/toolchain/check/testdata/basics/fail_name_lookup.carbon index e26bf5a256fb..fe9c3cf40fa4 100644 --- a/toolchain/check/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/check/testdata/basics/fail_name_lookup.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_name_lookup.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon index 54c2fd57ad34..5b34600d12d6 100644 --- a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon +++ b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon @@ -12,7 +12,7 @@ var x: type = 42; // CHECK:STDOUT: --- fail_non_type_as_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var // CHECK:STDOUT: %.loc10: i32 = int_literal 42 diff --git a/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon b/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon index 4b45e8b45425..6e1431c6403d 100644 --- a/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon +++ b/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon @@ -13,7 +13,7 @@ var y: i32 = x.b; // CHECK:STDOUT: --- fail_qualifier_unsupported.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %y.var: ref i32 = var y diff --git a/toolchain/check/testdata/basics/multifile.carbon b/toolchain/check/testdata/basics/multifile.carbon index 128c38bd8114..9da5483cad34 100644 --- a/toolchain/check/testdata/basics/multifile.carbon +++ b/toolchain/check/testdata/basics/multifile.carbon @@ -17,7 +17,7 @@ fn B() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} +// CHECK:STDOUT: package: = namespace package, {.A = %A} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: @@ -29,7 +29,7 @@ fn B() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B} +// CHECK:STDOUT: package: = namespace package, {.B = %B} // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon index 385f0376f2f5..03d8c690ca71 100644 --- a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon @@ -22,16 +22,18 @@ fn B() {} // CHECK:STDOUT: filename: a.carbon // CHECK:STDOUT: sem_ir: // CHECK:STDOUT: cross_ref_irs_size: 1 +// CHECK:STDOUT: name_scopes: +// CHECK:STDOUT: name_scope0: {inst: inst+0, enclosing_scope: name_scope, has_error: false, extended_scopes: [], names: {name0: inst+1}} // CHECK:STDOUT: bind_names: {} // CHECK:STDOUT: functions: -// CHECK:STDOUT: function0: {name: name0, param_refs: empty, body: [block2]} +// CHECK:STDOUT: function0: {name: name0, enclosing_scope: name_scope0, param_refs: empty, body: [block2]} // CHECK:STDOUT: classes: {} // CHECK:STDOUT: types: // CHECK:STDOUT: type0: {inst: instNamespaceType, value_rep: {kind: copy, type: type0}} // CHECK:STDOUT: type1: {inst: instFunctionType, value_rep: {kind: copy, type: type1}} // CHECK:STDOUT: type_blocks: {} // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} // CHECK:STDOUT: inst+1: {kind: FunctionDecl, arg0: function0, type: type1} // CHECK:STDOUT: inst+2: {kind: Return} // CHECK:STDOUT: inst_blocks: @@ -48,7 +50,7 @@ fn B() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} +// CHECK:STDOUT: package: = namespace package, {.A = %A} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: @@ -61,16 +63,18 @@ fn B() {} // CHECK:STDOUT: filename: b.carbon // CHECK:STDOUT: sem_ir: // CHECK:STDOUT: cross_ref_irs_size: 1 +// CHECK:STDOUT: name_scopes: +// CHECK:STDOUT: name_scope0: {inst: inst+0, enclosing_scope: name_scope, has_error: false, extended_scopes: [], names: {name0: inst+1}} // CHECK:STDOUT: bind_names: {} // CHECK:STDOUT: functions: -// CHECK:STDOUT: function0: {name: name0, param_refs: empty, body: [block2]} +// CHECK:STDOUT: function0: {name: name0, enclosing_scope: name_scope0, param_refs: empty, body: [block2]} // CHECK:STDOUT: classes: {} // CHECK:STDOUT: types: // CHECK:STDOUT: type0: {inst: instNamespaceType, value_rep: {kind: copy, type: type0}} // CHECK:STDOUT: type1: {inst: instFunctionType, value_rep: {kind: copy, type: type1}} // CHECK:STDOUT: type_blocks: {} // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} // CHECK:STDOUT: inst+1: {kind: FunctionDecl, arg0: function0, type: type1} // CHECK:STDOUT: inst+2: {kind: Return} // CHECK:STDOUT: inst_blocks: @@ -87,7 +91,7 @@ fn B() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B} +// CHECK:STDOUT: package: = namespace package, {.B = %B} // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/multifile_raw_ir.carbon b/toolchain/check/testdata/basics/multifile_raw_ir.carbon index 57bbdbf1b88d..4dcbf4087642 100644 --- a/toolchain/check/testdata/basics/multifile_raw_ir.carbon +++ b/toolchain/check/testdata/basics/multifile_raw_ir.carbon @@ -22,16 +22,18 @@ fn B() {} // CHECK:STDOUT: filename: a.carbon // CHECK:STDOUT: sem_ir: // CHECK:STDOUT: cross_ref_irs_size: 1 +// CHECK:STDOUT: name_scopes: +// CHECK:STDOUT: name_scope0: {inst: inst+0, enclosing_scope: name_scope, has_error: false, extended_scopes: [], names: {name0: inst+1}} // CHECK:STDOUT: bind_names: {} // CHECK:STDOUT: functions: -// CHECK:STDOUT: function0: {name: name0, param_refs: empty, body: [block2]} +// CHECK:STDOUT: function0: {name: name0, enclosing_scope: name_scope0, param_refs: empty, body: [block2]} // CHECK:STDOUT: classes: {} // CHECK:STDOUT: types: // CHECK:STDOUT: type0: {inst: instNamespaceType, value_rep: {kind: copy, type: type0}} // CHECK:STDOUT: type1: {inst: instFunctionType, value_rep: {kind: copy, type: type1}} // CHECK:STDOUT: type_blocks: {} // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} // CHECK:STDOUT: inst+1: {kind: FunctionDecl, arg0: function0, type: type1} // CHECK:STDOUT: inst+2: {kind: Return} // CHECK:STDOUT: inst_blocks: @@ -48,16 +50,18 @@ fn B() {} // CHECK:STDOUT: filename: b.carbon // CHECK:STDOUT: sem_ir: // CHECK:STDOUT: cross_ref_irs_size: 1 +// CHECK:STDOUT: name_scopes: +// CHECK:STDOUT: name_scope0: {inst: inst+0, enclosing_scope: name_scope, has_error: false, extended_scopes: [], names: {name0: inst+1}} // CHECK:STDOUT: bind_names: {} // CHECK:STDOUT: functions: -// CHECK:STDOUT: function0: {name: name0, param_refs: empty, body: [block2]} +// CHECK:STDOUT: function0: {name: name0, enclosing_scope: name_scope0, param_refs: empty, body: [block2]} // CHECK:STDOUT: classes: {} // CHECK:STDOUT: types: // CHECK:STDOUT: type0: {inst: instNamespaceType, value_rep: {kind: copy, type: type0}} // CHECK:STDOUT: type1: {inst: instFunctionType, value_rep: {kind: copy, type: type1}} // CHECK:STDOUT: type_blocks: {} // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} // CHECK:STDOUT: inst+1: {kind: FunctionDecl, arg0: function0, type: type1} // CHECK:STDOUT: inst+2: {kind: Return} // CHECK:STDOUT: inst_blocks: diff --git a/toolchain/check/testdata/basics/numeric_literals.carbon b/toolchain/check/testdata/basics/numeric_literals.carbon index b5c4a628cc58..5bdc926f0d63 100644 --- a/toolchain/check/testdata/basics/numeric_literals.carbon +++ b/toolchain/check/testdata/basics/numeric_literals.carbon @@ -35,7 +35,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/parens.carbon b/toolchain/check/testdata/basics/parens.carbon index 686b6518ee2a..4828016623a8 100644 --- a/toolchain/check/testdata/basics/parens.carbon +++ b/toolchain/check/testdata/basics/parens.carbon @@ -10,7 +10,7 @@ var b: i32 = ((2)); // CHECK:STDOUT: --- parens.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: %.loc7: i32 = int_literal 1 diff --git a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon index 06929217ad66..4f65be38f078 100644 --- a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon @@ -16,10 +16,12 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: filename: raw_and_textual_ir.carbon // CHECK:STDOUT: sem_ir: // CHECK:STDOUT: cross_ref_irs_size: 1 +// CHECK:STDOUT: name_scopes: +// CHECK:STDOUT: name_scope0: {inst: inst+0, enclosing_scope: name_scope, has_error: false, extended_scopes: [], names: {name0: inst+9}} // CHECK:STDOUT: bind_names: // CHECK:STDOUT: bindName0: {name: name1, enclosing_scope: name_scope} // CHECK:STDOUT: functions: -// CHECK:STDOUT: function0: {name: name0, param_refs: block2, return_type: type4, return_slot: inst+7, body: [block5]} +// CHECK:STDOUT: function0: {name: name0, enclosing_scope: name_scope0, param_refs: block2, return_type: type4, return_slot: inst+7, body: [block5]} // CHECK:STDOUT: classes: {} // CHECK:STDOUT: types: // CHECK:STDOUT: type0: {inst: instNamespaceType, value_rep: {kind: copy, type: type0}} @@ -39,7 +41,7 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: 1: type1 // CHECK:STDOUT: 2: type3 // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} // CHECK:STDOUT: inst+1: {kind: Param, arg0: name1, type: type1} // CHECK:STDOUT: inst+2: {kind: BindName, arg0: bindName0, arg1: inst+1, type: type1} // CHECK:STDOUT: inst+3: {kind: TupleType, arg0: typeBlock0, type: typeTypeType} @@ -114,7 +116,7 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/raw_identifier.carbon b/toolchain/check/testdata/basics/raw_identifier.carbon index 5b69100dde64..f67d587bce01 100644 --- a/toolchain/check/testdata/basics/raw_identifier.carbon +++ b/toolchain/check/testdata/basics/raw_identifier.carbon @@ -23,7 +23,7 @@ fn C(r#if: i32) -> i32 { // CHECK:STDOUT: --- raw_identifier.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .C = %C} +// CHECK:STDOUT: package: = namespace package, {.A = %A, .B = %B, .C = %C} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: %C: = fn_decl @C diff --git a/toolchain/check/testdata/basics/raw_ir.carbon b/toolchain/check/testdata/basics/raw_ir.carbon index 4999d983d004..d6ad53f3f3d2 100644 --- a/toolchain/check/testdata/basics/raw_ir.carbon +++ b/toolchain/check/testdata/basics/raw_ir.carbon @@ -16,10 +16,12 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: filename: raw_ir.carbon // CHECK:STDOUT: sem_ir: // CHECK:STDOUT: cross_ref_irs_size: 1 +// CHECK:STDOUT: name_scopes: +// CHECK:STDOUT: name_scope0: {inst: inst+0, enclosing_scope: name_scope, has_error: false, extended_scopes: [], names: {name0: inst+9}} // CHECK:STDOUT: bind_names: // CHECK:STDOUT: bindName0: {name: name1, enclosing_scope: name_scope} // CHECK:STDOUT: functions: -// CHECK:STDOUT: function0: {name: name0, param_refs: block2, return_type: type4, return_slot: inst+7, body: [block5]} +// CHECK:STDOUT: function0: {name: name0, enclosing_scope: name_scope0, param_refs: block2, return_type: type4, return_slot: inst+7, body: [block5]} // CHECK:STDOUT: classes: {} // CHECK:STDOUT: types: // CHECK:STDOUT: type0: {inst: instNamespaceType, value_rep: {kind: copy, type: type0}} @@ -39,7 +41,7 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: 1: type1 // CHECK:STDOUT: 2: type3 // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} // CHECK:STDOUT: inst+1: {kind: Param, arg0: name1, type: type1} // CHECK:STDOUT: inst+2: {kind: BindName, arg0: bindName0, arg1: inst+1, type: type1} // CHECK:STDOUT: inst+3: {kind: TupleType, arg0: typeBlock0, type: typeTypeType} diff --git a/toolchain/check/testdata/basics/run.carbon b/toolchain/check/testdata/basics/run.carbon index 9feef50f300c..887483f78c28 100644 --- a/toolchain/check/testdata/basics/run.carbon +++ b/toolchain/check/testdata/basics/run.carbon @@ -9,7 +9,7 @@ fn Run() {} // CHECK:STDOUT: --- run.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Run = %Run} // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/run_i32.carbon b/toolchain/check/testdata/basics/run_i32.carbon index 15fa3101decc..a1342cf72493 100644 --- a/toolchain/check/testdata/basics/run_i32.carbon +++ b/toolchain/check/testdata/basics/run_i32.carbon @@ -9,7 +9,7 @@ fn Run() -> i32 { return 0; } // CHECK:STDOUT: --- run_i32.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Run = %Run} // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/textual_ir.carbon b/toolchain/check/testdata/basics/textual_ir.carbon index 229e385eaf72..ccc9a0820a2c 100644 --- a/toolchain/check/testdata/basics/textual_ir.carbon +++ b/toolchain/check/testdata/basics/textual_ir.carbon @@ -21,7 +21,7 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base.carbon b/toolchain/check/testdata/class/base.carbon index 08b29f6026ea..af33729dae97 100644 --- a/toolchain/check/testdata/class/base.carbon +++ b/toolchain/check/testdata/class/base.carbon @@ -38,7 +38,7 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} +// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Base: type = class_type @Base // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () diff --git a/toolchain/check/testdata/class/base_field.carbon b/toolchain/check/testdata/class/base_field.carbon index 2e2db2f958dc..583a32cac4eb 100644 --- a/toolchain/check/testdata/class/base_field.carbon +++ b/toolchain/check/testdata/class/base_field.carbon @@ -33,7 +33,7 @@ fn Access(p: Derived*) -> i32* { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Access = %Access} +// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl, .Access = %Access} // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Base: type = class_type @Base // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () diff --git a/toolchain/check/testdata/class/base_function_unqualified.carbon b/toolchain/check/testdata/class/base_function_unqualified.carbon index d5c0f73dc8b7..9000387767c7 100644 --- a/toolchain/check/testdata/class/base_function_unqualified.carbon +++ b/toolchain/check/testdata/class/base_function_unqualified.carbon @@ -29,7 +29,7 @@ fn Derived.H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl} +// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl} // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Base: type = class_type @Base // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () diff --git a/toolchain/check/testdata/class/base_method.carbon b/toolchain/check/testdata/class/base_method.carbon index 758892a4c3cc..f17e03470f8a 100644 --- a/toolchain/check/testdata/class/base_method.carbon +++ b/toolchain/check/testdata/class/base_method.carbon @@ -34,7 +34,7 @@ fn Call(p: Derived*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} +// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Base: type = class_type @Base // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/base_method_shadow.carbon b/toolchain/check/testdata/class/base_method_shadow.carbon index 9cc67c3dd6aa..bffcda3f8886 100644 --- a/toolchain/check/testdata/class/base_method_shadow.carbon +++ b/toolchain/check/testdata/class/base_method_shadow.carbon @@ -44,7 +44,7 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl, .B = %B.decl, .C = %C.decl, .D = %D.decl, .Call = %Call} +// CHECK:STDOUT: package: = namespace package, {.A = %A.decl, .B = %B.decl, .C = %C.decl, .D = %D.decl, .Call = %Call} // CHECK:STDOUT: %A.decl = class_decl @A, () // CHECK:STDOUT: %A: type = class_type @A // CHECK:STDOUT: %B.decl = class_decl @B, () diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index 2dbe8c37fe53..c8b43def6466 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -29,7 +29,7 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Run = %Run} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G diff --git a/toolchain/check/testdata/class/derived_to_base.carbon b/toolchain/check/testdata/class/derived_to_base.carbon index 4aa2fe59edb2..47a5bfd6b402 100644 --- a/toolchain/check/testdata/class/derived_to_base.carbon +++ b/toolchain/check/testdata/class/derived_to_base.carbon @@ -52,7 +52,7 @@ fn ConvertInit() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl, .B = %B.decl, .C = %C.decl, .ConvertCToB = %ConvertCToB, .ConvertBToA = %ConvertBToA, .ConvertCToA = %ConvertCToA, .ConvertValue = %ConvertValue, .ConvertRef = %ConvertRef, .ConvertInit = %ConvertInit} +// CHECK:STDOUT: package: = namespace package, {.A = %A.decl, .B = %B.decl, .C = %C.decl, .ConvertCToB = %ConvertCToB, .ConvertBToA = %ConvertBToA, .ConvertCToA = %ConvertCToA, .ConvertValue = %ConvertValue, .ConvertRef = %ConvertRef, .ConvertInit = %ConvertInit} // CHECK:STDOUT: %A.decl = class_decl @A, () // CHECK:STDOUT: %A: type = class_type @A // CHECK:STDOUT: %B.decl = class_decl @B, () diff --git a/toolchain/check/testdata/class/fail_abstract.carbon b/toolchain/check/testdata/class/fail_abstract.carbon index decb4e873c0f..acbf95fdf35d 100644 --- a/toolchain/check/testdata/class/fail_abstract.carbon +++ b/toolchain/check/testdata/class/fail_abstract.carbon @@ -42,7 +42,7 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Abstract = %Abstract.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} +// CHECK:STDOUT: package: = namespace package, {.Abstract = %Abstract.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} // CHECK:STDOUT: %Abstract.decl = class_decl @Abstract, () // CHECK:STDOUT: %Abstract: type = class_type @Abstract // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () diff --git a/toolchain/check/testdata/class/fail_addr_not_self.carbon b/toolchain/check/testdata/class/fail_addr_not_self.carbon index cad4b40d9375..f2f11a85cf95 100644 --- a/toolchain/check/testdata/class/fail_addr_not_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_not_self.carbon @@ -23,7 +23,7 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_addr_self.carbon b/toolchain/check/testdata/class/fail_addr_self.carbon index 4326350cef12..9f277b00e210 100644 --- a/toolchain/check/testdata/class/fail_addr_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_self.carbon @@ -47,7 +47,7 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F.2 diff --git a/toolchain/check/testdata/class/fail_base_bad_type.carbon b/toolchain/check/testdata/class/fail_base_bad_type.carbon index a7320166ef4f..35ff30dbbcd4 100644 --- a/toolchain/check/testdata/class/fail_base_bad_type.carbon +++ b/toolchain/check/testdata/class/fail_base_bad_type.carbon @@ -137,7 +137,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Final = %Final.decl, .DeriveFromError = %DeriveFromError.decl, .AccessMemberWithInvalidBaseError = %AccessMemberWithInvalidBaseError, .DeriveFromNonType = %DeriveFromNonType.decl, .AccessMemberWithInvalidBasNonType = %AccessMemberWithInvalidBasNonType, .DeriveFromi32 = %DeriveFromi32.decl, .ConvertToBadBasei32 = %ConvertToBadBasei32, .AccessMemberWithInvalidBasei32 = %AccessMemberWithInvalidBasei32, .DeriveFromTuple = %DeriveFromTuple.decl, .ConvertToBadBaseTuple = %ConvertToBadBaseTuple, .AccessMemberWithInvalidBaseTuple = %AccessMemberWithInvalidBaseTuple, .DeriveFromStruct = %DeriveFromStruct.decl, .ConvertToBadBaseStruct = %ConvertToBadBaseStruct, .AccessMemberWithInvalidBaseStruct = %AccessMemberWithInvalidBaseStruct, .Incomplete = %Incomplete.decl, .DeriveFromIncomplete = %DeriveFromIncomplete.decl, .ConvertToBadBaseIncomplete = %ConvertToBadBaseIncomplete, .AccessMemberWithInvalidBaseIncomplete = %AccessMemberWithInvalidBaseIncomplete, .DeriveFromFinal = %DeriveFromFinal.decl, .ConvertToBadBaseFinal = %ConvertToBadBaseFinal, .AccessMemberWithInvalidBaseFinal_WithMember = %AccessMemberWithInvalidBaseFinal_WithMember, .AccessMemberWithInvalidBaseFinal_NoMember = %AccessMemberWithInvalidBaseFinal_NoMember} +// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Final = %Final.decl, .DeriveFromError = %DeriveFromError.decl, .AccessMemberWithInvalidBaseError = %AccessMemberWithInvalidBaseError, .DeriveFromNonType = %DeriveFromNonType.decl, .AccessMemberWithInvalidBasNonType = %AccessMemberWithInvalidBasNonType, .DeriveFromi32 = %DeriveFromi32.decl, .ConvertToBadBasei32 = %ConvertToBadBasei32, .AccessMemberWithInvalidBasei32 = %AccessMemberWithInvalidBasei32, .DeriveFromTuple = %DeriveFromTuple.decl, .ConvertToBadBaseTuple = %ConvertToBadBaseTuple, .AccessMemberWithInvalidBaseTuple = %AccessMemberWithInvalidBaseTuple, .DeriveFromStruct = %DeriveFromStruct.decl, .ConvertToBadBaseStruct = %ConvertToBadBaseStruct, .AccessMemberWithInvalidBaseStruct = %AccessMemberWithInvalidBaseStruct, .Incomplete = %Incomplete.decl, .DeriveFromIncomplete = %DeriveFromIncomplete.decl, .ConvertToBadBaseIncomplete = %ConvertToBadBaseIncomplete, .AccessMemberWithInvalidBaseIncomplete = %AccessMemberWithInvalidBaseIncomplete, .DeriveFromFinal = %DeriveFromFinal.decl, .ConvertToBadBaseFinal = %ConvertToBadBaseFinal, .AccessMemberWithInvalidBaseFinal_WithMember = %AccessMemberWithInvalidBaseFinal_WithMember, .AccessMemberWithInvalidBaseFinal_NoMember = %AccessMemberWithInvalidBaseFinal_NoMember} // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Base: type = class_type @Base // CHECK:STDOUT: %Final.decl = class_decl @Final, () diff --git a/toolchain/check/testdata/class/fail_base_method_define.carbon b/toolchain/check/testdata/class/fail_base_method_define.carbon index d186fe7aa990..77a82bae6040 100644 --- a/toolchain/check/testdata/class/fail_base_method_define.carbon +++ b/toolchain/check/testdata/class/fail_base_method_define.carbon @@ -36,7 +36,7 @@ fn D.C.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B.decl, .D = %D.decl} +// CHECK:STDOUT: package: = namespace package, {.B = %B.decl, .D = %D.decl} // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %B: type = class_type @B // CHECK:STDOUT: %D.decl = class_decl @D, () diff --git a/toolchain/check/testdata/class/fail_base_modifiers.carbon b/toolchain/check/testdata/class/fail_base_modifiers.carbon index 4cbf1aac3e37..81cd0a487bbf 100644 --- a/toolchain/check/testdata/class/fail_base_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_base_modifiers.carbon @@ -53,7 +53,7 @@ class C4 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B.decl, .C1 = %C1.decl, .C2 = %C2.decl, .C3 = %C3.decl, .C4 = %C4.decl} +// CHECK:STDOUT: package: = namespace package, {.B = %B.decl, .C1 = %C1.decl, .C2 = %C2.decl, .C3 = %C3.decl, .C4 = %C4.decl} // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %B: type = class_type @B // CHECK:STDOUT: %C1.decl = class_decl @C1, () diff --git a/toolchain/check/testdata/class/fail_base_no_extend.carbon b/toolchain/check/testdata/class/fail_base_no_extend.carbon index 3b9662ca531e..6cfe9470b50a 100644 --- a/toolchain/check/testdata/class/fail_base_no_extend.carbon +++ b/toolchain/check/testdata/class/fail_base_no_extend.carbon @@ -23,7 +23,7 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B.decl, .C = %C.decl} +// CHECK:STDOUT: package: = namespace package, {.B = %B.decl, .C = %C.decl} // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %B: type = class_type @B // CHECK:STDOUT: %C.decl = class_decl @C, () diff --git a/toolchain/check/testdata/class/fail_base_repeated.carbon b/toolchain/check/testdata/class/fail_base_repeated.carbon index 9558b4630e36..a54f26b95df0 100644 --- a/toolchain/check/testdata/class/fail_base_repeated.carbon +++ b/toolchain/check/testdata/class/fail_base_repeated.carbon @@ -40,7 +40,7 @@ class D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B1 = %B1.decl, .B2 = %B2.decl, .C = %C.decl, .D = %D.decl} +// CHECK:STDOUT: package: = namespace package, {.B1 = %B1.decl, .B2 = %B2.decl, .C = %C.decl, .D = %D.decl} // CHECK:STDOUT: %B1.decl = class_decl @B1, () // CHECK:STDOUT: %B1: type = class_type @B1 // CHECK:STDOUT: %B2.decl = class_decl @B2, () diff --git a/toolchain/check/testdata/class/fail_base_unbound.carbon b/toolchain/check/testdata/class/fail_base_unbound.carbon index 35ddf5c6dfea..120dd7e17b99 100644 --- a/toolchain/check/testdata/class/fail_base_unbound.carbon +++ b/toolchain/check/testdata/class/fail_base_unbound.carbon @@ -25,7 +25,7 @@ let b: B = C.base; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B.decl, .C = %C.decl} +// CHECK:STDOUT: package: = namespace package, {.B = %B.decl, .C = %C.decl} // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %B: type = class_type @B // CHECK:STDOUT: %C.decl = class_decl @C, () diff --git a/toolchain/check/testdata/class/fail_derived_to_base.carbon b/toolchain/check/testdata/class/fail_derived_to_base.carbon index 2c14a854825a..f30a7ca0e009 100644 --- a/toolchain/check/testdata/class/fail_derived_to_base.carbon +++ b/toolchain/check/testdata/class/fail_derived_to_base.carbon @@ -41,7 +41,7 @@ fn ConvertIncomplete(p: Incomplete*) -> A2* { return p; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A1 = %A1.decl, .A2 = %A2.decl, .B2 = %B2.decl, .ConvertUnrelated = %ConvertUnrelated, .Incomplete = %Incomplete.decl, .ConvertIncomplete = %ConvertIncomplete} +// CHECK:STDOUT: package: = namespace package, {.A1 = %A1.decl, .A2 = %A2.decl, .B2 = %B2.decl, .ConvertUnrelated = %ConvertUnrelated, .Incomplete = %Incomplete.decl, .ConvertIncomplete = %ConvertIncomplete} // CHECK:STDOUT: %A1.decl = class_decl @A1, () // CHECK:STDOUT: %A1: type = class_type @A1 // CHECK:STDOUT: %A2.decl = class_decl @A2, () diff --git a/toolchain/check/testdata/class/fail_field_modifiers.carbon b/toolchain/check/testdata/class/fail_field_modifiers.carbon index 0c49ca91488d..ce222eaae15d 100644 --- a/toolchain/check/testdata/class/fail_field_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_field_modifiers.carbon @@ -34,7 +34,7 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_incomplete.carbon b/toolchain/check/testdata/class/fail_incomplete.carbon index 3696fec6b4c2..644cfddc6f16 100644 --- a/toolchain/check/testdata/class/fail_incomplete.carbon +++ b/toolchain/check/testdata/class/fail_incomplete.carbon @@ -123,7 +123,7 @@ fn CallReturnIncomplete() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .CallClassFunction = %CallClassFunction, .global_var = %global_var, .ConvertFromStruct = %ConvertFromStruct, .MemberAccess = %MemberAccess, .Copy = %Copy, .Let = %Let, .TakeIncomplete = %TakeIncomplete, .ReturnIncomplete = %ReturnIncomplete, .CallTakeIncomplete = %CallTakeIncomplete, .CallReturnIncomplete = %CallReturnIncomplete} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .CallClassFunction = %CallClassFunction, .global_var = %global_var, .ConvertFromStruct = %ConvertFromStruct, .MemberAccess = %MemberAccess, .Copy = %Copy, .Let = %Let, .TakeIncomplete = %TakeIncomplete, .ReturnIncomplete = %ReturnIncomplete, .CallTakeIncomplete = %CallTakeIncomplete, .CallReturnIncomplete = %CallReturnIncomplete} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %.loc15: = fn_decl @.1 diff --git a/toolchain/check/testdata/class/fail_init.carbon b/toolchain/check/testdata/class/fail_init.carbon index 291a98424bfe..abce10965ee4 100644 --- a/toolchain/check/testdata/class/fail_init.carbon +++ b/toolchain/check/testdata/class/fail_init.carbon @@ -35,7 +35,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/fail_init_as_inplace.carbon b/toolchain/check/testdata/class/fail_init_as_inplace.carbon index 1ff18be2970f..046387ef7a3f 100644 --- a/toolchain/check/testdata/class/fail_init_as_inplace.carbon +++ b/toolchain/check/testdata/class/fail_init_as_inplace.carbon @@ -31,7 +31,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .G = %G, .F = %F} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G diff --git a/toolchain/check/testdata/class/fail_memaccess_category.carbon b/toolchain/check/testdata/class/fail_memaccess_category.carbon index efa2fbc8a4e2..b2cd44f45ae4 100644 --- a/toolchain/check/testdata/class/fail_memaccess_category.carbon +++ b/toolchain/check/testdata/class/fail_memaccess_category.carbon @@ -45,7 +45,7 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl, .B = %B.decl, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.A = %A.decl, .B = %B.decl, .F = %F} // CHECK:STDOUT: %A.decl = class_decl @A, () // CHECK:STDOUT: %A: type = class_type @A // CHECK:STDOUT: %B.decl = class_decl @B, () diff --git a/toolchain/check/testdata/class/fail_member_of_let.carbon b/toolchain/check/testdata/class/fail_member_of_let.carbon index 7cfbfef99f59..325bb55a84ed 100644 --- a/toolchain/check/testdata/class/fail_member_of_let.carbon +++ b/toolchain/check/testdata/class/fail_member_of_let.carbon @@ -25,7 +25,7 @@ fn T.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class diff --git a/toolchain/check/testdata/class/fail_method.carbon b/toolchain/check/testdata/class/fail_method.carbon index 7db77563ca9e..afb9b74018e9 100644 --- a/toolchain/check/testdata/class/fail_method.carbon +++ b/toolchain/check/testdata/class/fail_method.carbon @@ -39,7 +39,7 @@ fn F(c: Class) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/fail_method_modifiers.carbon b/toolchain/check/testdata/class/fail_method_modifiers.carbon index 5ef92f79ebf6..b82098ef5ac4 100644 --- a/toolchain/check/testdata/class/fail_method_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_method_modifiers.carbon @@ -54,7 +54,7 @@ base class BaseClass { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.FinalClass = %FinalClass.decl, .AbstractClass = %AbstractClass.decl, .BaseClass = %BaseClass.decl} +// CHECK:STDOUT: package: = namespace package, {.FinalClass = %FinalClass.decl, .AbstractClass = %AbstractClass.decl, .BaseClass = %BaseClass.decl} // CHECK:STDOUT: %FinalClass.decl = class_decl @FinalClass, () // CHECK:STDOUT: %FinalClass: type = class_type @FinalClass // CHECK:STDOUT: %AbstractClass.decl = class_decl @AbstractClass, () diff --git a/toolchain/check/testdata/class/fail_modifiers.carbon b/toolchain/check/testdata/class/fail_modifiers.carbon index 36eeeb4bacc7..dc067c14052c 100644 --- a/toolchain/check/testdata/class/fail_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_modifiers.carbon @@ -71,7 +71,7 @@ abstract base class AbstractAndBase {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.DuplicatePrivate = %DuplicatePrivate.decl, .TwoAccess = %TwoAccess.decl, .TwoAbstract = %TwoAbstract.decl, .Virtual = %Virtual.decl, .WrongOrder = %WrongOrder.decl, .AbstractAndBase = %AbstractAndBase.decl} +// CHECK:STDOUT: package: = namespace package, {.DuplicatePrivate = %DuplicatePrivate.decl, .TwoAccess = %TwoAccess.decl, .TwoAbstract = %TwoAbstract.decl, .Virtual = %Virtual.decl, .WrongOrder = %WrongOrder.decl, .AbstractAndBase = %AbstractAndBase.decl} // CHECK:STDOUT: %DuplicatePrivate.decl = class_decl @DuplicatePrivate, () // CHECK:STDOUT: %DuplicatePrivate: type = class_type @DuplicatePrivate // CHECK:STDOUT: %TwoAccess.decl = class_decl @TwoAccess, () diff --git a/toolchain/check/testdata/class/fail_out_of_line_decl.carbon b/toolchain/check/testdata/class/fail_out_of_line_decl.carbon index 627409e0eca1..9272f8f293da 100644 --- a/toolchain/check/testdata/class/fail_out_of_line_decl.carbon +++ b/toolchain/check/testdata/class/fail_out_of_line_decl.carbon @@ -18,7 +18,7 @@ fn C.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.C = %C.decl} +// CHECK:STDOUT: package: = namespace package, {.C = %C.decl} // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: %C: type = class_type @C // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon index 69e394ac013a..4ea1f2543b94 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon @@ -81,7 +81,7 @@ base class G; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl.loc7, .B = %B.decl.loc16, .C = %C.decl.loc25, .D = %D.decl.loc34, .E = %E.decl.loc43, .F = %F.decl.loc52, .G = %G.decl.loc61} +// CHECK:STDOUT: package: = namespace package, {.A = %A.decl.loc7, .B = %B.decl.loc16, .C = %C.decl.loc25, .D = %D.decl.loc34, .E = %E.decl.loc43, .F = %F.decl.loc52, .G = %G.decl.loc61} // CHECK:STDOUT: %A.decl.loc7 = class_decl @A, () // CHECK:STDOUT: %A: type = class_type @A // CHECK:STDOUT: %A.decl.loc14 = class_decl @A, () diff --git a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon index 239ffac9a11e..349dc141f3fa 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon @@ -28,7 +28,7 @@ class Y { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl.loc7, .X = %X.decl, .Y = %Y.decl} +// CHECK:STDOUT: package: = namespace package, {.A = %A.decl.loc7, .X = %X.decl, .Y = %Y.decl} // CHECK:STDOUT: %A.decl.loc7 = class_decl @A.1, () // CHECK:STDOUT: %A: type = class_type @A.1 // CHECK:STDOUT: %X.decl = class_decl @X, () diff --git a/toolchain/check/testdata/class/fail_redefinition.carbon b/toolchain/check/testdata/class/fail_redefinition.carbon index ba466a96354f..ff26a20e94f2 100644 --- a/toolchain/check/testdata/class/fail_redefinition.carbon +++ b/toolchain/check/testdata/class/fail_redefinition.carbon @@ -31,7 +31,7 @@ fn Class.H() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl.loc7} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl.loc7} // CHECK:STDOUT: %Class.decl.loc7 = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Class.decl.loc18 = class_decl @Class, () diff --git a/toolchain/check/testdata/class/fail_reorder.carbon b/toolchain/check/testdata/class/fail_reorder.carbon index cb46175745c5..beb9258d2059 100644 --- a/toolchain/check/testdata/class/fail_reorder.carbon +++ b/toolchain/check/testdata/class/fail_reorder.carbon @@ -32,7 +32,7 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_scope.carbon b/toolchain/check/testdata/class/fail_scope.carbon index 583202535d73..cf57d3336552 100644 --- a/toolchain/check/testdata/class/fail_scope.carbon +++ b/toolchain/check/testdata/class/fail_scope.carbon @@ -24,7 +24,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .G = %G} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G diff --git a/toolchain/check/testdata/class/fail_self.carbon b/toolchain/check/testdata/class/fail_self.carbon index c1ada1e2c7df..e9b2736874af 100644 --- a/toolchain/check/testdata/class/fail_self.carbon +++ b/toolchain/check/testdata/class/fail_self.carbon @@ -59,7 +59,7 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .WrongSelf = %WrongSelf.decl, .CallWrongSelf = %CallWrongSelf} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .WrongSelf = %WrongSelf.decl, .CallWrongSelf = %CallWrongSelf} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F.1 diff --git a/toolchain/check/testdata/class/fail_todo_modifiers.carbon b/toolchain/check/testdata/class/fail_todo_modifiers.carbon index 8ac3e21c337a..95e9670cf404 100644 --- a/toolchain/check/testdata/class/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_todo_modifiers.carbon @@ -66,7 +66,7 @@ abstract class Abstract { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Access = %Access.decl, .Base = %Base.decl, .Abstract = %Abstract.decl} +// CHECK:STDOUT: package: = namespace package, {.Access = %Access.decl, .Base = %Base.decl, .Abstract = %Abstract.decl} // CHECK:STDOUT: %Access.decl = class_decl @Access, () // CHECK:STDOUT: %Access: type = class_type @Access // CHECK:STDOUT: %Base.decl = class_decl @Base, () diff --git a/toolchain/check/testdata/class/fail_unbound_field.carbon b/toolchain/check/testdata/class/fail_unbound_field.carbon index 3c9b334596db..9817fc7e1ad0 100644 --- a/toolchain/check/testdata/class/fail_unbound_field.carbon +++ b/toolchain/check/testdata/class/fail_unbound_field.carbon @@ -28,7 +28,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .G = %G} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G diff --git a/toolchain/check/testdata/class/fail_unknown_member.carbon b/toolchain/check/testdata/class/fail_unknown_member.carbon index 681e4873919f..9d916e80bf04 100644 --- a/toolchain/check/testdata/class/fail_unknown_member.carbon +++ b/toolchain/check/testdata/class/fail_unknown_member.carbon @@ -24,7 +24,7 @@ fn G(c: Class) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .G = %G} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G diff --git a/toolchain/check/testdata/class/field_access.carbon b/toolchain/check/testdata/class/field_access.carbon index 71b18033b52f..32662d9bdb74 100644 --- a/toolchain/check/testdata/class/field_access.carbon +++ b/toolchain/check/testdata/class/field_access.carbon @@ -25,7 +25,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Run = %Run} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Run: = fn_decl @Run diff --git a/toolchain/check/testdata/class/field_access_in_value.carbon b/toolchain/check/testdata/class/field_access_in_value.carbon index fbc5ce4822c1..7cfa7c23bbce 100644 --- a/toolchain/check/testdata/class/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field_access_in_value.carbon @@ -26,7 +26,7 @@ fn Test() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Test = %Test} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Test = %Test} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Test: = fn_decl @Test diff --git a/toolchain/check/testdata/class/forward_declared.carbon b/toolchain/check/testdata/class/forward_declared.carbon index 30f3e19eca40..eec8a579e135 100644 --- a/toolchain/check/testdata/class/forward_declared.carbon +++ b/toolchain/check/testdata/class/forward_declared.carbon @@ -11,7 +11,7 @@ fn F(p: Class*) -> Class* { return p; } // CHECK:STDOUT: --- forward_declared.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index 2d2394016ddf..f25340762a86 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -26,7 +26,7 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Make = %Make, .MakeReorder = %MakeReorder} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Make = %Make, .MakeReorder = %MakeReorder} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Make: = fn_decl @Make diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index 68f2b8df18e0..d1c59bb1dc3b 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -21,7 +21,7 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index 9ac4ab67c668..985eb3facc17 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -32,7 +32,7 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Inner = %Inner.decl, .MakeInner = %MakeInner, .Outer = %Outer.decl, .MakeOuter = %MakeOuter} +// CHECK:STDOUT: package: = namespace package, {.Inner = %Inner.decl, .MakeInner = %MakeInner, .Outer = %Outer.decl, .MakeOuter = %MakeOuter} // CHECK:STDOUT: %Inner.decl = class_decl @Inner, () // CHECK:STDOUT: %Inner: type = class_type @Inner // CHECK:STDOUT: %MakeInner: = fn_decl @MakeInner diff --git a/toolchain/check/testdata/class/method.carbon b/toolchain/check/testdata/class/method.carbon index c994dad4fb73..722db48969fb 100644 --- a/toolchain/check/testdata/class/method.carbon +++ b/toolchain/check/testdata/class/method.carbon @@ -52,7 +52,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Call = %Call, .CallWithAddr = %CallWithAddr, .CallFThroughPointer = %CallFThroughPointer, .CallGThroughPointer = %CallGThroughPointer, .Make = %Make, .CallFOnInitializingExpr = %CallFOnInitializingExpr, .CallGOnInitializingExpr = %CallGOnInitializingExpr} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Call = %Call, .CallWithAddr = %CallWithAddr, .CallFThroughPointer = %CallFThroughPointer, .CallGThroughPointer = %CallGThroughPointer, .Make = %Make, .CallFOnInitializingExpr = %CallFOnInitializingExpr, .CallGOnInitializingExpr = %CallGOnInitializingExpr} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index 7f752066d3ad..aab1ac76653b 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -38,7 +38,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Outer = %Outer.decl, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.Outer = %Outer.decl, .F = %F} // CHECK:STDOUT: %Outer.decl = class_decl @Outer, () // CHECK:STDOUT: %Outer: type = class_type @Outer // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index 175c00ff881d..5f519c1b3d84 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -29,7 +29,7 @@ fn G(o: Outer) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Outer = %Outer.decl, .F = %F, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.Outer = %Outer.decl, .F = %F, .G = %G} // CHECK:STDOUT: %Outer.decl = class_decl @Outer, () // CHECK:STDOUT: %Outer: type = class_type @Outer // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/raw_self.carbon b/toolchain/check/testdata/class/raw_self.carbon index 5612bb3911a7..338316fd652e 100644 --- a/toolchain/check/testdata/class/raw_self.carbon +++ b/toolchain/check/testdata/class/raw_self.carbon @@ -29,7 +29,7 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/raw_self_type.carbon b/toolchain/check/testdata/class/raw_self_type.carbon index 68c4f3e8aec1..afd70f95a5a5 100644 --- a/toolchain/check/testdata/class/raw_self_type.carbon +++ b/toolchain/check/testdata/class/raw_self_type.carbon @@ -18,7 +18,7 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/redeclaration.carbon b/toolchain/check/testdata/class/redeclaration.carbon index b60c60a084a4..81b30d003c0f 100644 --- a/toolchain/check/testdata/class/redeclaration.carbon +++ b/toolchain/check/testdata/class/redeclaration.carbon @@ -19,7 +19,7 @@ fn Class.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl.loc7} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl.loc7} // CHECK:STDOUT: %Class.decl.loc7 = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Class.decl.loc9 = class_decl @Class, () diff --git a/toolchain/check/testdata/class/redeclaration_introducer.carbon b/toolchain/check/testdata/class/redeclaration_introducer.carbon index 77b3dc227280..fb1966229299 100644 --- a/toolchain/check/testdata/class/redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/redeclaration_introducer.carbon @@ -19,7 +19,7 @@ abstract class C {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl.loc7, .B = %B.decl.loc8, .C = %C.decl.loc9} +// CHECK:STDOUT: package: = namespace package, {.A = %A.decl.loc7, .B = %B.decl.loc8, .C = %C.decl.loc9} // CHECK:STDOUT: %A.decl.loc7 = class_decl @A, () // CHECK:STDOUT: %A: type = class_type @A // CHECK:STDOUT: %B.decl.loc8 = class_decl @B, () diff --git a/toolchain/check/testdata/class/reenter_scope.carbon b/toolchain/check/testdata/class/reenter_scope.carbon index b03966f307b5..0175de322183 100644 --- a/toolchain/check/testdata/class/reenter_scope.carbon +++ b/toolchain/check/testdata/class/reenter_scope.carbon @@ -20,7 +20,7 @@ fn Class.F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index 87cae352485b..d5fd095631e9 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -30,7 +30,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F, .Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F, .Run = %Run} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F.2 diff --git a/toolchain/check/testdata/class/self.carbon b/toolchain/check/testdata/class/self.carbon index 954ec95e20ab..d9239452f332 100644 --- a/toolchain/check/testdata/class/self.carbon +++ b/toolchain/check/testdata/class/self.carbon @@ -27,7 +27,7 @@ fn Class.G[addr self: Class*]() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/self_conversion.carbon b/toolchain/check/testdata/class/self_conversion.carbon index ea8c131f8f9a..9e5f34d3d96b 100644 --- a/toolchain/check/testdata/class/self_conversion.carbon +++ b/toolchain/check/testdata/class/self_conversion.carbon @@ -40,7 +40,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} +// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Base: type = class_type @Base // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () diff --git a/toolchain/check/testdata/class/self_type.carbon b/toolchain/check/testdata/class/self_type.carbon index 7f4c34e70911..9a42a6c67001 100644 --- a/toolchain/check/testdata/class/self_type.carbon +++ b/toolchain/check/testdata/class/self_type.carbon @@ -24,7 +24,7 @@ fn Class.F[self: Class]() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/class/static_method.carbon b/toolchain/check/testdata/class/static_method.carbon index 66b3a40eebe1..8b9b6462e8a1 100644 --- a/toolchain/check/testdata/class/static_method.carbon +++ b/toolchain/check/testdata/class/static_method.carbon @@ -22,7 +22,7 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Run = %Run} // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Run: = fn_decl @Run diff --git a/toolchain/check/testdata/const/collapse.carbon b/toolchain/check/testdata/const/collapse.carbon index 986dc0d5a15b..626d58cdb4da 100644 --- a/toolchain/check/testdata/const/collapse.carbon +++ b/toolchain/check/testdata/const/collapse.carbon @@ -15,7 +15,7 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: --- collapse.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/const/fail_collapse.carbon b/toolchain/check/testdata/const/fail_collapse.carbon index b28e8da535ab..262344cb65ca 100644 --- a/toolchain/check/testdata/const/fail_collapse.carbon +++ b/toolchain/check/testdata/const/fail_collapse.carbon @@ -17,7 +17,7 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: --- fail_collapse.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G} +// CHECK:STDOUT: package: = namespace package, {.G = %G} // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon index db85b04a5909..6b46e03364a3 100644 --- a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon @@ -25,7 +25,7 @@ fn H() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .H = %H} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .H = %H} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %H: = fn_decl @H diff --git a/toolchain/check/testdata/function/call/empty_struct.carbon b/toolchain/check/testdata/function/call/empty_struct.carbon index 5c0725e96ede..b17e77769a90 100644 --- a/toolchain/check/testdata/function/call/empty_struct.carbon +++ b/toolchain/check/testdata/function/call/empty_struct.carbon @@ -20,7 +20,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Echo = %Echo, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Echo = %Echo, .Main = %Main} // CHECK:STDOUT: %Echo: = fn_decl @Echo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/empty_tuple.carbon b/toolchain/check/testdata/function/call/empty_tuple.carbon index fcad4473d2b5..7f048e99c0d1 100644 --- a/toolchain/check/testdata/function/call/empty_tuple.carbon +++ b/toolchain/check/testdata/function/call/empty_tuple.carbon @@ -19,7 +19,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Echo = %Echo, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Echo = %Echo, .Main = %Main} // CHECK:STDOUT: %Echo: = fn_decl @Echo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_not_callable.carbon b/toolchain/check/testdata/function/call/fail_not_callable.carbon index 25fc3adbff70..2e8e5f35ec52 100644 --- a/toolchain/check/testdata/function/call/fail_not_callable.carbon +++ b/toolchain/check/testdata/function/call/fail_not_callable.carbon @@ -18,7 +18,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Run = %Run} // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/fail_param_count.carbon b/toolchain/check/testdata/function/call/fail_param_count.carbon index c24dbbfb8543..ccac6a514e60 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -62,7 +62,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run0 = %Run0, .Run1 = %Run1, .Run2 = %Run2, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Run0 = %Run0, .Run1 = %Run1, .Run2 = %Run2, .Main = %Main} // CHECK:STDOUT: %Run0: = fn_decl @Run0 // CHECK:STDOUT: %Run1: = fn_decl @Run1 // CHECK:STDOUT: %Run2: = fn_decl @Run2 diff --git a/toolchain/check/testdata/function/call/fail_param_type.carbon b/toolchain/check/testdata/function/call/fail_param_type.carbon index 600b4c8196f8..ce76805b083e 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -23,7 +23,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.G = %G, .F = %F} // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon index 4cec2849b571..d442861b1601 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -16,7 +16,7 @@ fn Run() { // CHECK:STDOUT: --- fail_return_type_mismatch.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Run = %Run} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index a7ec9ef6dffe..5c5ad507c3cc 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -15,7 +15,7 @@ fn Main() { // CHECK:STDOUT: --- i32.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Echo = %Echo, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Echo = %Echo, .Main = %Main} // CHECK:STDOUT: %Echo: = fn_decl @Echo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index 63fa2eb5aff1..7c7cb36a5d7c 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -21,7 +21,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index 878d731593a9..944fb15db29a 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -17,7 +17,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_one_comma.carbon b/toolchain/check/testdata/function/call/params_one_comma.carbon index 8bbabf9378a2..86340f0ad43e 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index ff2f327f88fb..b0e8b39c8b06 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -17,7 +17,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_two_comma.carbon b/toolchain/check/testdata/function/call/params_two_comma.carbon index d03acda0b678..734c369ea031 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_zero.carbon b/toolchain/check/testdata/function/call/params_zero.carbon index 037b23fac1d2..7d0a1b1a436e 100644 --- a/toolchain/check/testdata/function/call/params_zero.carbon +++ b/toolchain/check/testdata/function/call/params_zero.carbon @@ -17,7 +17,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/return_implicit.carbon b/toolchain/check/testdata/function/call/return_implicit.carbon index b0ee0f37d8d6..64f57ddda291 100644 --- a/toolchain/check/testdata/function/call/return_implicit.carbon +++ b/toolchain/check/testdata/function/call/return_implicit.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.MakeImplicitEmptyTuple = %MakeImplicitEmptyTuple, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.MakeImplicitEmptyTuple = %MakeImplicitEmptyTuple, .Main = %Main} // CHECK:STDOUT: %MakeImplicitEmptyTuple: = fn_decl @MakeImplicitEmptyTuple // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon index d421ab7f7f55..a80cfc632fb3 100644 --- a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon +++ b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon @@ -73,7 +73,7 @@ default final virtual fn ModifiersConflict2() {} // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.WrongOrder = %WrongOrder, .DuplicateVirtual = %DuplicateVirtual, .TwoAccess = %TwoAccess, .ModifiersConflict = %ModifiersConflict, .InvalidModifier = %InvalidModifier, .ModifiersConflict2 = %ModifiersConflict2} +// CHECK:STDOUT: package: = namespace package, {.WrongOrder = %WrongOrder, .DuplicateVirtual = %DuplicateVirtual, .TwoAccess = %TwoAccess, .ModifiersConflict = %ModifiersConflict, .InvalidModifier = %InvalidModifier, .ModifiersConflict2 = %ModifiersConflict2} // CHECK:STDOUT: %WrongOrder: = fn_decl @WrongOrder // CHECK:STDOUT: %DuplicateVirtual: = fn_decl @DuplicateVirtual // CHECK:STDOUT: %TwoAccess: = fn_decl @TwoAccess diff --git a/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon b/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon index 5bc4e87d52af..156fe528133d 100644 --- a/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon @@ -12,7 +12,7 @@ private fn F(); // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/simple.carbon b/toolchain/check/testdata/function/declaration/simple.carbon index 065767dbc7b8..03d3f2a64142 100644 --- a/toolchain/check/testdata/function/declaration/simple.carbon +++ b/toolchain/check/testdata/function/declaration/simple.carbon @@ -15,7 +15,7 @@ fn G() { F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon b/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon index 6e2e3c821010..c48d02ccf617 100644 --- a/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon +++ b/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon @@ -15,7 +15,7 @@ fn Bar(a: i32, a: i32) {} // CHECK:STDOUT: --- fail_param_name_conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Bar = %Bar} +// CHECK:STDOUT: package: = namespace package, {.Bar = %Bar} // CHECK:STDOUT: %Bar: = fn_decl @Bar // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/order.carbon b/toolchain/check/testdata/function/definition/order.carbon index 4d6cc3f013c2..575e2cad80fd 100644 --- a/toolchain/check/testdata/function/definition/order.carbon +++ b/toolchain/check/testdata/function/definition/order.carbon @@ -11,7 +11,7 @@ fn Baz() {} // CHECK:STDOUT: --- order.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Bar = %Bar, .Baz = %Baz} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Bar = %Bar, .Baz = %Baz} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Bar: = fn_decl @Bar // CHECK:STDOUT: %Baz: = fn_decl @Baz diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index e35caa1e925f..2bfda88419b6 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -9,7 +9,7 @@ fn Foo(a: i32) {} // CHECK:STDOUT: --- params_one.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_one_comma.carbon b/toolchain/check/testdata/function/definition/params_one_comma.carbon index 6fdbe21bd384..ab537a4c13e1 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -9,7 +9,7 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: --- params_one_comma.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index b65e322a4b9b..3888b1840797 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -9,7 +9,7 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: --- params_two.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_two_comma.carbon b/toolchain/check/testdata/function/definition/params_two_comma.carbon index c4d38bc4fe1f..897095412736 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -9,7 +9,7 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: --- params_two_comma.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_zero.carbon b/toolchain/check/testdata/function/definition/params_zero.carbon index 21bb1fb901d0..a85340f9ce74 100644 --- a/toolchain/check/testdata/function/definition/params_zero.carbon +++ b/toolchain/check/testdata/function/definition/params_zero.carbon @@ -9,7 +9,7 @@ fn Foo() {} // CHECK:STDOUT: --- params_zero.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/same_param_name.carbon b/toolchain/check/testdata/function/definition/same_param_name.carbon index 5be264a2ae81..a8a028e6d53b 100644 --- a/toolchain/check/testdata/function/definition/same_param_name.carbon +++ b/toolchain/check/testdata/function/definition/same_param_name.carbon @@ -10,7 +10,7 @@ fn Bar(a: i32) {} // CHECK:STDOUT: --- same_param_name.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Bar = %Bar} +// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Bar = %Bar} // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Bar: = fn_decl @Bar // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon b/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon index 6822380b0480..48ded25fbee3 100644 --- a/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon +++ b/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon @@ -15,7 +15,7 @@ fn F(T:! type, U:! type) { // CHECK:STDOUT: --- fail_type_param_mismatch.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/type_param.carbon b/toolchain/check/testdata/function/generic/type_param.carbon index 29238e3b9a2f..caf800b160e4 100644 --- a/toolchain/check/testdata/function/generic/type_param.carbon +++ b/toolchain/check/testdata/function/generic/type_param.carbon @@ -12,7 +12,7 @@ fn F(T:! type) { // CHECK:STDOUT: --- type_param.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/else.carbon b/toolchain/check/testdata/if/else.carbon index f248edebc48f..3066d232a02e 100644 --- a/toolchain/check/testdata/if/else.carbon +++ b/toolchain/check/testdata/if/else.carbon @@ -24,7 +24,7 @@ fn If(b: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .H = %H, .If = %If} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .H = %H, .If = %If} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %H: = fn_decl @H diff --git a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon index a352968eb83a..502913da2500 100644 --- a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon @@ -36,7 +36,7 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: --- fail_reachable_fallthrough.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.If1 = %If1, .If2 = %If2, .If3 = %If3} +// CHECK:STDOUT: package: = namespace package, {.If1 = %If1, .If2 = %If2, .If3 = %If3} // CHECK:STDOUT: %If1: = fn_decl @If1 // CHECK:STDOUT: %If2: = fn_decl @If2 // CHECK:STDOUT: %If3: = fn_decl @If3 diff --git a/toolchain/check/testdata/if/fail_scope.carbon b/toolchain/check/testdata/if/fail_scope.carbon index 3ab6048fc63e..6de5cc18fa1c 100644 --- a/toolchain/check/testdata/if/fail_scope.carbon +++ b/toolchain/check/testdata/if/fail_scope.carbon @@ -18,7 +18,7 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: --- fail_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.VarScope = %VarScope} +// CHECK:STDOUT: package: = namespace package, {.VarScope = %VarScope} // CHECK:STDOUT: %VarScope: = fn_decl @VarScope // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/no_else.carbon b/toolchain/check/testdata/if/no_else.carbon index 938e2545d335..debc3542cb0e 100644 --- a/toolchain/check/testdata/if/no_else.carbon +++ b/toolchain/check/testdata/if/no_else.carbon @@ -21,7 +21,7 @@ fn If(b: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .If = %If} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .If = %If} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %If: = fn_decl @If diff --git a/toolchain/check/testdata/if/unreachable_fallthrough.carbon b/toolchain/check/testdata/if/unreachable_fallthrough.carbon index b222693fe48f..646030bde899 100644 --- a/toolchain/check/testdata/if/unreachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/unreachable_fallthrough.carbon @@ -16,7 +16,7 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: --- unreachable_fallthrough.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.If = %If} +// CHECK:STDOUT: package: = namespace package, {.If = %If} // CHECK:STDOUT: %If: = fn_decl @If // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index 0df36735e607..38ab323933b8 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -17,7 +17,7 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index 9c17a3db26d3..c415bacc38f2 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -18,7 +18,7 @@ fn G() -> i32 { // CHECK:STDOUT: --- constant_condition.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .F = %F, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.A = %A, .B = %B, .F = %F, .G = %G} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/if_expr/control_flow.carbon b/toolchain/check/testdata/if_expr/control_flow.carbon index 04bc37bedf07..7db88b9b0e64 100644 --- a/toolchain/check/testdata/if_expr/control_flow.carbon +++ b/toolchain/check/testdata/if_expr/control_flow.carbon @@ -14,7 +14,7 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: --- control_flow.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.A = %A, .B = %B, .F = %F} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/if_expr/nested.carbon b/toolchain/check/testdata/if_expr/nested.carbon index cb377ee2e5f9..895abde4a9b6 100644 --- a/toolchain/check/testdata/if_expr/nested.carbon +++ b/toolchain/check/testdata/if_expr/nested.carbon @@ -11,7 +11,7 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: --- nested.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index 4354d6c747bc..4841c67bca80 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -19,7 +19,7 @@ fn F(cond: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.G = %G, .F = %F} // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/array_element_access.carbon b/toolchain/check/testdata/index/array_element_access.carbon index b009216ee18f..73d69ee90e49 100644 --- a/toolchain/check/testdata/index/array_element_access.carbon +++ b/toolchain/check/testdata/index/array_element_access.carbon @@ -17,7 +17,7 @@ var d: i32 = a[b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c, .d = %d} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c, .d = %d} // CHECK:STDOUT: %.loc7_14: i32 = int_literal 2 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 2] = var a diff --git a/toolchain/check/testdata/index/expr_category.carbon b/toolchain/check/testdata/index/expr_category.carbon index 1e8bad35d404..1b2e91f91889 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -32,7 +32,7 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .ValueBinding = %ValueBinding} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .ValueBinding = %ValueBinding} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %ValueBinding: = fn_decl @ValueBinding diff --git a/toolchain/check/testdata/index/fail_array_large_index.carbon b/toolchain/check/testdata/index/fail_array_large_index.carbon index 49470a72cdb8..5f20dc868585 100644 --- a/toolchain/check/testdata/index/fail_array_large_index.carbon +++ b/toolchain/check/testdata/index/fail_array_large_index.carbon @@ -18,7 +18,7 @@ var b: i32 = a[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon index 84d15f3952a2..6e06674a3578 100644 --- a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon @@ -18,7 +18,7 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon index a3eb45493af8..19ce47e5c465 100644 --- a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon +++ b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon @@ -18,7 +18,7 @@ var b: i32 = a[2]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon index 62d48d01e857..e23e6f9c3044 100644 --- a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon @@ -20,7 +20,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .Run = %Run} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index 5c1f96e71747..a911e6adb2d0 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -36,7 +36,7 @@ fn G(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index f25393c088c8..f85e215ac977 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -38,8 +38,8 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.N = %.loc11, .a = %a, .F = %F, .b = %b, .c = %c, .d = %d} -// CHECK:STDOUT: %.loc11: = namespace {} +// CHECK:STDOUT: package: = namespace package, {.N = %.loc11, .a = %a, .F = %F, .b = %b, .c = %c, .d = %d} +// CHECK:STDOUT: %.loc11: = namespace N, {} // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: %N.ref: = name_ref N, %.loc11 diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index e4c7ac263922..b51c58884fff 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_name_not_found.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon index 6d98444ad236..15cca93eafbf 100644 --- a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon +++ b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon @@ -20,7 +20,7 @@ var c: i32 = a[b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c} // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_non_tuple_access.carbon b/toolchain/check/testdata/index/fail_non_tuple_access.carbon index 62be8c89afcf..30ca55a1b6e4 100644 --- a/toolchain/check/testdata/index/fail_non_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_non_tuple_access.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_non_tuple_access.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_tuple_index_error.carbon b/toolchain/check/testdata/index/fail_tuple_index_error.carbon index 7a8b803f0d03..e093125243b3 100644 --- a/toolchain/check/testdata/index/fail_tuple_index_error.carbon +++ b/toolchain/check/testdata/index/fail_tuple_index_error.carbon @@ -19,7 +19,7 @@ var b: i32 = a[oops]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_tuple_large_index.carbon b/toolchain/check/testdata/index/fail_tuple_large_index.carbon index 296b92e120f3..b4195154bc51 100644 --- a/toolchain/check/testdata/index/fail_tuple_large_index.carbon +++ b/toolchain/check/testdata/index/fail_tuple_large_index.carbon @@ -19,7 +19,7 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c} // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.loc7_13.2 // CHECK:STDOUT: %a.var: ref (i32,) = var a diff --git a/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon b/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon index f43072b76968..4dd336570a82 100644 --- a/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon @@ -19,7 +19,7 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon b/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon index caa8ba6daad1..13f4a1df2800 100644 --- a/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon +++ b/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon @@ -19,7 +19,7 @@ var b: i32 = a[2]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/tuple_element_access.carbon b/toolchain/check/testdata/index/tuple_element_access.carbon index 5e6c1dadbb1d..0cee2c285477 100644 --- a/toolchain/check/testdata/index/tuple_element_access.carbon +++ b/toolchain/check/testdata/index/tuple_element_access.carbon @@ -16,7 +16,7 @@ var c: i32 = b[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} +// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c} // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.loc7_13.2 // CHECK:STDOUT: %a.var: ref (i32,) = var a diff --git a/toolchain/check/testdata/index/tuple_return_value_access.carbon b/toolchain/check/testdata/index/tuple_return_value_access.carbon index 70051b16a844..b5d3c336d59c 100644 --- a/toolchain/check/testdata/index/tuple_return_value_access.carbon +++ b/toolchain/check/testdata/index/tuple_return_value_access.carbon @@ -18,7 +18,7 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .Run = %Run} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .Run = %Run} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/basic.carbon b/toolchain/check/testdata/interface/basic.carbon index b0075e7b9c14..c44c734ecba9 100644 --- a/toolchain/check/testdata/interface/basic.carbon +++ b/toolchain/check/testdata/interface/basic.carbon @@ -16,7 +16,7 @@ interface ForwardDeclared { // CHECK:STDOUT: --- basic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %Empty.decl, .ForwardDeclared = %ForwardDeclared.decl.loc10} +// CHECK:STDOUT: package: = namespace package, {.Empty = %Empty.decl, .ForwardDeclared = %ForwardDeclared.decl.loc10} // CHECK:STDOUT: %Empty.decl = interface_decl @Empty, () // CHECK:STDOUT: %ForwardDeclared.decl.loc10 = interface_decl @ForwardDeclared, () // CHECK:STDOUT: %ForwardDeclared.decl.loc12 = interface_decl @ForwardDeclared, () diff --git a/toolchain/check/testdata/interface/fail_duplicate.carbon b/toolchain/check/testdata/interface/fail_duplicate.carbon index dd59329c6f3a..c6c2de535aa4 100644 --- a/toolchain/check/testdata/interface/fail_duplicate.carbon +++ b/toolchain/check/testdata/interface/fail_duplicate.carbon @@ -39,7 +39,7 @@ interface Class { } // CHECK:STDOUT: --- fail_duplicate.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Interface = %Interface.decl.loc7, .Function = %Function, .Class = %Class.decl} +// CHECK:STDOUT: package: = namespace package, {.Interface = %Interface.decl.loc7, .Function = %Function, .Class = %Class.decl} // CHECK:STDOUT: %Interface.decl.loc7 = interface_decl @Interface, () // CHECK:STDOUT: %Interface.decl.loc15 = interface_decl @Interface, () // CHECK:STDOUT: %Function: = fn_decl @Function diff --git a/toolchain/check/testdata/interface/fail_modifiers.carbon b/toolchain/check/testdata/interface/fail_modifiers.carbon index ff8f2a23f0d8..91e054c33b1f 100644 --- a/toolchain/check/testdata/interface/fail_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_modifiers.carbon @@ -29,7 +29,7 @@ protected interface Protected; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Abstract = %Abstract.decl, .Default = %Default.decl, .Virtual = %Virtual.decl, .Protected = %Protected.decl} +// CHECK:STDOUT: package: = namespace package, {.Abstract = %Abstract.decl, .Default = %Default.decl, .Virtual = %Virtual.decl, .Protected = %Protected.decl} // CHECK:STDOUT: %Abstract.decl = interface_decl @Abstract, () // CHECK:STDOUT: %Default.decl = interface_decl @Default, () // CHECK:STDOUT: %Virtual.decl = interface_decl @Virtual, () diff --git a/toolchain/check/testdata/interface/fail_todo_modifiers.carbon b/toolchain/check/testdata/interface/fail_todo_modifiers.carbon index f1ac02d0dce0..a965d03a281e 100644 --- a/toolchain/check/testdata/interface/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_todo_modifiers.carbon @@ -24,7 +24,7 @@ private interface Private { // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Modifiers = %Modifiers.decl, .Private = %Private.decl} +// CHECK:STDOUT: package: = namespace package, {.Modifiers = %Modifiers.decl, .Private = %Private.decl} // CHECK:STDOUT: %Modifiers.decl = interface_decl @Modifiers, () // CHECK:STDOUT: %Private.decl = interface_decl @Private, () // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon index 1585861a3f16..1416b61b1a81 100644 --- a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon @@ -9,7 +9,7 @@ fn A() { if (true) { var n: i32 = 1; } if (true) { var n: i32 = 2; } } // CHECK:STDOUT: --- duplicate_name_same_line.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} +// CHECK:STDOUT: package: = namespace package, {.A = %A} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/convert.carbon b/toolchain/check/testdata/let/convert.carbon index 459d7a855724..831e01972f1d 100644 --- a/toolchain/check/testdata/let/convert.carbon +++ b/toolchain/check/testdata/let/convert.carbon @@ -20,7 +20,7 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_duplicate_decl.carbon b/toolchain/check/testdata/let/fail_duplicate_decl.carbon index 6c8e2c76aac4..1700a6abfca4 100644 --- a/toolchain/check/testdata/let/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/let/fail_duplicate_decl.carbon @@ -17,7 +17,7 @@ fn F(a: i32) { // CHECK:STDOUT: --- fail_duplicate_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_generic.carbon b/toolchain/check/testdata/let/fail_generic.carbon index 8677107202f4..e35e45400fd1 100644 --- a/toolchain/check/testdata/let/fail_generic.carbon +++ b/toolchain/check/testdata/let/fail_generic.carbon @@ -20,7 +20,7 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: --- fail_generic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_modifiers.carbon b/toolchain/check/testdata/let/fail_modifiers.carbon index 35d631b25560..2974fd1a9b40 100644 --- a/toolchain/check/testdata/let/fail_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_modifiers.carbon @@ -71,7 +71,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %.loc10: i32 = int_literal 1 // CHECK:STDOUT: %b: i32 = bind_name b, %.loc10 // CHECK:STDOUT: %.loc15: i32 = int_literal 1 diff --git a/toolchain/check/testdata/let/fail_todo_modifiers.carbon b/toolchain/check/testdata/let/fail_todo_modifiers.carbon index fc07456977e1..5012eec79e50 100644 --- a/toolchain/check/testdata/let/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_todo_modifiers.carbon @@ -12,7 +12,7 @@ private let a: i32 = 1; // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %.loc10: i32 = int_literal 1 // CHECK:STDOUT: %a: i32 = bind_name a, %.loc10 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/fail_use_in_init.carbon b/toolchain/check/testdata/let/fail_use_in_init.carbon index c21376106e9e..7bae79f4cc6b 100644 --- a/toolchain/check/testdata/let/fail_use_in_init.carbon +++ b/toolchain/check/testdata/let/fail_use_in_init.carbon @@ -14,7 +14,7 @@ fn F() { // CHECK:STDOUT: --- fail_use_in_init.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/generic.carbon b/toolchain/check/testdata/let/generic.carbon index d8cbe00aeaaa..301e10dd0033 100644 --- a/toolchain/check/testdata/let/generic.carbon +++ b/toolchain/check/testdata/let/generic.carbon @@ -13,7 +13,7 @@ fn F() { // CHECK:STDOUT: --- generic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/global.carbon b/toolchain/check/testdata/let/global.carbon index 292e318e06e6..8e3827ae6948 100644 --- a/toolchain/check/testdata/let/global.carbon +++ b/toolchain/check/testdata/let/global.carbon @@ -11,7 +11,7 @@ fn F() -> i32 { return n; } // CHECK:STDOUT: --- global.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %.loc7: i32 = int_literal 1 // CHECK:STDOUT: %n: i32 = bind_name n, %.loc7 // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/let/local.carbon b/toolchain/check/testdata/let/local.carbon index 07554d251206..9fad792c1c24 100644 --- a/toolchain/check/testdata/let/local.carbon +++ b/toolchain/check/testdata/let/local.carbon @@ -12,7 +12,7 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: --- local.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/add_to_import.carbon b/toolchain/check/testdata/namespace/add_to_import.carbon new file mode 100644 index 000000000000..718064d689d8 --- /dev/null +++ b/toolchain/check/testdata/namespace/add_to_import.carbon @@ -0,0 +1,47 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE + +// --- implicit.carbon + +package Implicit api; + +namespace NS; + +// --- implicit.impl.carbon + +package Implicit impl; + +fn NS.A() -> i32 { return 0; } + +var a: i32 = NS.A(); + +// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4} +// CHECK:STDOUT: %.loc4: = namespace NS, {} +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.NS = %.2, .a = %a} +// CHECK:STDOUT: %.2: = namespace NS, {.A = %A} +// CHECK:STDOUT: %A: = fn_decl @A +// CHECK:STDOUT: %a.var: ref i32 = var a +// CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var +// CHECK:STDOUT: %NS.ref: = name_ref NS, %.2 +// CHECK:STDOUT: %A.ref: = name_ref A, %A +// CHECK:STDOUT: %.loc6: init i32 = call %A.ref() +// CHECK:STDOUT: assign %a.var, %.loc6 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @A() -> i32 { +// CHECK:STDOUT: !entry: +// CHECK:STDOUT: %.loc4: i32 = int_literal 0 +// CHECK:STDOUT: return %.loc4 +// CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_duplicate.carbon b/toolchain/check/testdata/namespace/fail_duplicate.carbon index 39b30966c3b1..2fb2a15a365b 100644 --- a/toolchain/check/testdata/namespace/fail_duplicate.carbon +++ b/toolchain/check/testdata/namespace/fail_duplicate.carbon @@ -21,8 +21,8 @@ fn Foo.Baz() { // CHECK:STDOUT: --- fail_duplicate.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %.loc7} -// CHECK:STDOUT: %.loc7: = namespace {.Baz = %Baz.loc9} +// CHECK:STDOUT: package: = namespace package, {.Foo = %.loc7} +// CHECK:STDOUT: %.loc7: = namespace Foo, {.Baz = %Baz.loc9} // CHECK:STDOUT: %Baz.loc9: = fn_decl @Baz // CHECK:STDOUT: %Baz.loc18: = fn_decl @Baz // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/fail_import_of_repeat.carbon b/toolchain/check/testdata/namespace/fail_import_of_repeat.carbon new file mode 100644 index 000000000000..78b55edf2556 --- /dev/null +++ b/toolchain/check/testdata/namespace/fail_import_of_repeat.carbon @@ -0,0 +1,38 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE + +// --- implicit.carbon + +package Implicit api; + +namespace NS; +// CHECK:STDERR: implicit.carbon:[[@LINE+6]]:11: ERROR: Duplicate name being declared in the same scope. +// CHECK:STDERR: namespace NS; +// CHECK:STDERR: ^~ +// CHECK:STDERR: implicit.carbon:[[@LINE-4]]:1: Name is previously declared here. +// CHECK:STDERR: namespace NS; +// CHECK:STDERR: ^~~~~~~~~~~~~ +namespace NS; + +// --- implicit.impl.carbon + +package Implicit impl; + +// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4} +// CHECK:STDOUT: %.loc4: = namespace NS, {} +// CHECK:STDOUT: %.loc11: = namespace , {} +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.NS = %.2} +// CHECK:STDOUT: %.2: = namespace NS, {} +// CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_modifiers.carbon b/toolchain/check/testdata/namespace/fail_modifiers.carbon index d62a4a7e567e..397c884de0f5 100644 --- a/toolchain/check/testdata/namespace/fail_modifiers.carbon +++ b/toolchain/check/testdata/namespace/fail_modifiers.carbon @@ -38,8 +38,8 @@ impl namespace Bar; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %.loc31, .Bar = %.loc36} -// CHECK:STDOUT: %.loc31: = namespace {} -// CHECK:STDOUT: %.loc36: = namespace {} +// CHECK:STDOUT: package: = namespace package, {.Foo = %.loc31, .Bar = %.loc36} +// CHECK:STDOUT: %.loc31: = namespace Foo, {} +// CHECK:STDOUT: %.loc36: = namespace Bar, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon index fad174a55df0..eb660b156ae3 100644 --- a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon +++ b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon @@ -13,7 +13,7 @@ fn Foo.Baz() { // CHECK:STDOUT: --- fail_unresolved_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %.loc10: = fn_decl @.1 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/function.carbon b/toolchain/check/testdata/namespace/function.carbon index 5ec9beedcef0..affcc926a08d 100644 --- a/toolchain/check/testdata/namespace/function.carbon +++ b/toolchain/check/testdata/namespace/function.carbon @@ -24,8 +24,8 @@ fn Bar() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %.loc7, .Baz = %Baz.loc10, .Bar = %Bar} -// CHECK:STDOUT: %.loc7: = namespace {.Baz = %Baz.loc13} +// CHECK:STDOUT: package: = namespace package, {.Foo = %.loc7, .Baz = %Baz.loc10, .Bar = %Bar} +// CHECK:STDOUT: %.loc7: = namespace Foo, {.Baz = %Baz.loc13} // CHECK:STDOUT: %Baz.loc10: = fn_decl @Baz.1 // CHECK:STDOUT: %Baz.loc13: = fn_decl @Baz.2 // CHECK:STDOUT: %Bar: = fn_decl @Bar diff --git a/toolchain/check/testdata/namespace/imported.carbon b/toolchain/check/testdata/namespace/imported.carbon new file mode 100644 index 000000000000..2ca8cdb78448 --- /dev/null +++ b/toolchain/check/testdata/namespace/imported.carbon @@ -0,0 +1,94 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE + +// --- implicit.carbon + +package Implicit api; + +namespace NS; +namespace NS.ChildNS; + +fn NS.A(); +fn NS.ChildNS.B(); + +// --- implicit.impl.carbon + +package Implicit impl; + +var a: () = NS.A(); +var b: () = NS.ChildNS.B(); + +var package_a: () = package.NS.A(); +var package_b: () = package.NS.ChildNS.B(); + +// CHECK:STDOUT: --- implicit.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4} +// CHECK:STDOUT: %.loc4: = namespace NS, {.ChildNS = %.loc5, .A = %A} +// CHECK:STDOUT: %.loc5: = namespace ChildNS, {.B = %B} +// CHECK:STDOUT: %A: = fn_decl @A +// CHECK:STDOUT: %B: = fn_decl @B +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @A(); +// CHECK:STDOUT: +// CHECK:STDOUT: fn @B(); +// CHECK:STDOUT: +// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: constants { +// CHECK:STDOUT: %.loc4: type = tuple_type () +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.NS = %.2, .a = %a, .b = %b, .package_a = %package_a, .package_b = %package_b} +// CHECK:STDOUT: %.2: = namespace NS, {.ChildNS = %.3, .A = %.4} +// CHECK:STDOUT: %.3: = namespace ChildNS, {.B = %.5} +// CHECK:STDOUT: %.4: = fn_decl @.1 +// CHECK:STDOUT: %.5: = fn_decl @.2 +// CHECK:STDOUT: %.loc4_9.1: () = tuple_literal () +// CHECK:STDOUT: %.loc4_9.2: type = converted %.loc4_9.1, constants.%.loc4 +// CHECK:STDOUT: %a.var: ref () = var a +// CHECK:STDOUT: %a: ref () = bind_name a, %a.var +// CHECK:STDOUT: %NS.ref.loc4: = name_ref NS, %.2 +// CHECK:STDOUT: %A.ref.loc4: = name_ref A, %.4 +// CHECK:STDOUT: %.loc4_17: init () = call %A.ref.loc4() +// CHECK:STDOUT: assign %a.var, %.loc4_17 +// CHECK:STDOUT: %.loc5_9: () = tuple_literal () +// CHECK:STDOUT: %.loc4_9.3: type = converted %.loc5_9, constants.%.loc4 +// CHECK:STDOUT: %b.var: ref () = var b +// CHECK:STDOUT: %b: ref () = bind_name b, %b.var +// CHECK:STDOUT: %NS.ref.loc5: = name_ref NS, %.2 +// CHECK:STDOUT: %ChildNS.ref.loc5: = name_ref ChildNS, %.3 +// CHECK:STDOUT: %B.ref.loc5: = name_ref B, %.5 +// CHECK:STDOUT: %.loc5_25: init () = call %B.ref.loc5() +// CHECK:STDOUT: assign %b.var, %.loc5_25 +// CHECK:STDOUT: %.loc7_17: () = tuple_literal () +// CHECK:STDOUT: %.loc4_9.4: type = converted %.loc7_17, constants.%.loc4 +// CHECK:STDOUT: %package_a.var: ref () = var package_a +// CHECK:STDOUT: %package_a: ref () = bind_name package_a, %package_a.var +// CHECK:STDOUT: %package.ref.loc7: = name_ref package, package +// CHECK:STDOUT: %NS.ref.loc7: = name_ref NS, %.2 +// CHECK:STDOUT: %A.ref.loc7: = name_ref A, %.4 +// CHECK:STDOUT: %.loc7_33: init () = call %A.ref.loc7() +// CHECK:STDOUT: assign %package_a.var, %.loc7_33 +// CHECK:STDOUT: %.loc8_17: () = tuple_literal () +// CHECK:STDOUT: %.loc4_9.5: type = converted %.loc8_17, constants.%.loc4 +// CHECK:STDOUT: %package_b.var: ref () = var package_b +// CHECK:STDOUT: %package_b: ref () = bind_name package_b, %package_b.var +// CHECK:STDOUT: %package.ref.loc8: = name_ref package, package +// CHECK:STDOUT: %NS.ref.loc8: = name_ref NS, %.2 +// CHECK:STDOUT: %ChildNS.ref.loc8: = name_ref ChildNS, %.3 +// CHECK:STDOUT: %B.ref.loc8: = name_ref B, %.5 +// CHECK:STDOUT: %.loc8_41: init () = call %B.ref.loc8() +// CHECK:STDOUT: assign %package_b.var, %.loc8_41 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @.1(); +// CHECK:STDOUT: +// CHECK:STDOUT: fn @.2(); +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/imported_indirect.carbon b/toolchain/check/testdata/namespace/imported_indirect.carbon new file mode 100644 index 000000000000..f86328efb7f8 --- /dev/null +++ b/toolchain/check/testdata/namespace/imported_indirect.carbon @@ -0,0 +1,105 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE + +// --- a.carbon + +package Same library "a" api; + +namespace A; + +// --- b.carbon + +package Same library "b" api; +import library "a"; + +namespace A.B; + +// --- c.carbon + +package Same library "c" api; +import library "b"; + +namespace A.B.C; + +// --- d.carbon + +package Same library "d" api; +import library "c"; + +fn A.B.C.D() {}; + +// --- e.carbon + +package Same library "e" api; +import library "d"; + +var e: () = A.B.C.D(); + +// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.A = %.loc4} +// CHECK:STDOUT: %.loc4: = namespace A, {} +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.A = %.2} +// CHECK:STDOUT: %.2: = namespace A, {.B = %.loc5} +// CHECK:STDOUT: %.loc5: = namespace B, {} +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- c.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.A = %.2} +// CHECK:STDOUT: %.2: = namespace A, {.B = %.3} +// CHECK:STDOUT: %.3: = namespace B, {.C = %.loc5} +// CHECK:STDOUT: %.loc5: = namespace C, {} +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- d.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.A = %.2} +// CHECK:STDOUT: %.2: = namespace A, {.B = %.3} +// CHECK:STDOUT: %.3: = namespace B, {.C = %.4} +// CHECK:STDOUT: %.4: = namespace C, {.D = %D} +// CHECK:STDOUT: %D: = fn_decl @D +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @D() { +// CHECK:STDOUT: !entry: +// CHECK:STDOUT: return +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- e.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: constants { +// CHECK:STDOUT: %.loc5: type = tuple_type () +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace package, {.A = %.2, .e = %e} +// CHECK:STDOUT: %.2: = namespace A, {.B = %.3} +// CHECK:STDOUT: %.3: = namespace B, {.C = %.4} +// CHECK:STDOUT: %.4: = namespace C, {.D = %.5} +// CHECK:STDOUT: %.5: = fn_decl @.1 +// CHECK:STDOUT: %.loc5_9.1: () = tuple_literal () +// CHECK:STDOUT: %.loc5_9.2: type = converted %.loc5_9.1, constants.%.loc5 +// CHECK:STDOUT: %e.var: ref () = var e +// CHECK:STDOUT: %e: ref () = bind_name e, %e.var +// CHECK:STDOUT: %A.ref: = name_ref A, %.2 +// CHECK:STDOUT: %B.ref: = name_ref B, %.3 +// CHECK:STDOUT: %C.ref: = name_ref C, %.4 +// CHECK:STDOUT: %D.ref: = name_ref D, %.5 +// CHECK:STDOUT: %.loc5_20: init () = call %D.ref() +// CHECK:STDOUT: assign %e.var, %.loc5_20 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @.1(); +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/nested.carbon b/toolchain/check/testdata/namespace/nested.carbon index 9006afeeeea2..813eaeb63f45 100644 --- a/toolchain/check/testdata/namespace/nested.carbon +++ b/toolchain/check/testdata/namespace/nested.carbon @@ -21,9 +21,9 @@ fn Foo.Bar.Baz() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %.loc7} -// CHECK:STDOUT: %.loc7: = namespace {.Bar = %.loc8} -// CHECK:STDOUT: %.loc8: = namespace {.Wiz = %Wiz, .Baz = %Baz} +// CHECK:STDOUT: package: = namespace package, {.Foo = %.loc7} +// CHECK:STDOUT: %.loc7: = namespace Foo, {.Bar = %.loc8} +// CHECK:STDOUT: %.loc8: = namespace Bar, {.Wiz = %Wiz, .Baz = %Baz} // CHECK:STDOUT: %Wiz: = fn_decl @Wiz // CHECK:STDOUT: %Baz: = fn_decl @Baz // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index 54b3e4d31071..be1643938097 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -30,11 +30,11 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.loc7, .N = %.loc9} +// CHECK:STDOUT: package: = namespace package, {.A = %A.loc7, .N = %.loc9} // CHECK:STDOUT: %A.loc7: = fn_decl @A.1 -// CHECK:STDOUT: %.loc9: = namespace {.A = %A.loc10, .M = %.loc12} +// CHECK:STDOUT: %.loc9: = namespace N, {.A = %A.loc10, .M = %.loc12} // CHECK:STDOUT: %A.loc10: = fn_decl @A.2 -// CHECK:STDOUT: %.loc12: = namespace {.B = %B} +// CHECK:STDOUT: %.loc12: = namespace M, {.B = %B} // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/unqualified_lookup.carbon b/toolchain/check/testdata/namespace/unqualified_lookup.carbon index 9d909ada8ae7..7d94a56abc8a 100644 --- a/toolchain/check/testdata/namespace/unqualified_lookup.carbon +++ b/toolchain/check/testdata/namespace/unqualified_lookup.carbon @@ -33,9 +33,9 @@ fn OuterN.InnerN.CallABC() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.OuterN = %.loc7, .A = %A, .CallA = %CallA} -// CHECK:STDOUT: %.loc7: = namespace {.InnerN = %.loc8, .B = %B, .CallAB = %CallAB} -// CHECK:STDOUT: %.loc8: = namespace {.C = %C, .CallABC = %CallABC} +// CHECK:STDOUT: package: = namespace package, {.OuterN = %.loc7, .A = %A, .CallA = %CallA} +// CHECK:STDOUT: %.loc7: = namespace OuterN, {.InnerN = %.loc8, .B = %B, .CallAB = %CallAB} +// CHECK:STDOUT: %.loc8: = namespace InnerN, {.C = %C, .CallABC = %CallABC} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: %C: = fn_decl @C diff --git a/toolchain/check/testdata/operators/and.carbon b/toolchain/check/testdata/operators/and.carbon index 3ed1b9309a77..a2cc2c393ae0 100644 --- a/toolchain/check/testdata/operators/and.carbon +++ b/toolchain/check/testdata/operators/and.carbon @@ -14,7 +14,7 @@ fn And() -> bool { // CHECK:STDOUT: --- and.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .And = %And} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .And = %And} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %And: = fn_decl @And diff --git a/toolchain/check/testdata/operators/assignment.carbon b/toolchain/check/testdata/operators/assignment.carbon index 2738f08cb4ec..98a3739b799a 100644 --- a/toolchain/check/testdata/operators/assignment.carbon +++ b/toolchain/check/testdata/operators/assignment.carbon @@ -32,7 +32,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon index 712b88238d7e..1bb7deee72cb 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: --- fail_assignment_to_error.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon b/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon index 937176c58c61..9a3567a1b2b0 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon @@ -55,7 +55,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .Main = %Main} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/fail_type_mismatch.carbon index e3c7c159cee7..2dbe2e0f4e14 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_type_mismatch.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon index 26738d46a2bb..673b5d3b3434 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon @@ -15,7 +15,7 @@ fn Main() { // CHECK:STDOUT: --- fail_type_mismatch_assignment.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/or.carbon b/toolchain/check/testdata/operators/or.carbon index f56b4fd60f68..af288a75a3f2 100644 --- a/toolchain/check/testdata/operators/or.carbon +++ b/toolchain/check/testdata/operators/or.carbon @@ -14,7 +14,7 @@ fn Or() -> bool { // CHECK:STDOUT: --- or.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .Or = %Or} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .Or = %Or} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %Or: = fn_decl @Or diff --git a/toolchain/check/testdata/operators/unary_op.carbon b/toolchain/check/testdata/operators/unary_op.carbon index 649f3d066dba..0414f921e3cf 100644 --- a/toolchain/check/testdata/operators/unary_op.carbon +++ b/toolchain/check/testdata/operators/unary_op.carbon @@ -11,7 +11,7 @@ fn Not(b: bool) -> bool { // CHECK:STDOUT: --- unary_op.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Not = %Not} +// CHECK:STDOUT: package: = namespace package, {.Not = %Not} // CHECK:STDOUT: %Not: = fn_decl @Not // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/package_expr/fail_not_found.carbon b/toolchain/check/testdata/package_expr/fail_not_found.carbon index 73d9b232fe02..c64e4ff314b3 100644 --- a/toolchain/check/testdata/package_expr/fail_not_found.carbon +++ b/toolchain/check/testdata/package_expr/fail_not_found.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_not_found.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/package_expr/syntax.carbon b/toolchain/check/testdata/package_expr/syntax.carbon index 732125f40f51..fe7d46386127 100644 --- a/toolchain/check/testdata/package_expr/syntax.carbon +++ b/toolchain/check/testdata/package_expr/syntax.carbon @@ -45,7 +45,7 @@ fn Main() { // CHECK:STDOUT: --- global.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .Main = %Main} // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc4: i32 = int_literal 0 @@ -71,7 +71,7 @@ fn Main() { // CHECK:STDOUT: --- inside_fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .Main = %Main} // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc4: i32 = int_literal 0 @@ -102,8 +102,8 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc4, .Main = %Main} -// CHECK:STDOUT: %.loc4: = namespace {.C = %C.decl} +// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4, .Main = %Main} +// CHECK:STDOUT: %.loc4: = namespace NS, {.C = %C.decl} // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: %C: type = class_type @C // CHECK:STDOUT: %Main: = fn_decl @Main diff --git a/toolchain/check/testdata/packages/explicit_imports.carbon b/toolchain/check/testdata/packages/explicit_imports.carbon index 856fd72eb4ce..e996378f5ce3 100644 --- a/toolchain/check/testdata/packages/explicit_imports.carbon +++ b/toolchain/check/testdata/packages/explicit_imports.carbon @@ -37,25 +37,25 @@ import library "lib"; // CHECK:STDOUT: --- api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- same_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- different_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %import: = import ir1, ir2 // CHECK:STDOUT: %Api: = bind_name Api, %import // CHECK:STDOUT: } @@ -63,12 +63,12 @@ import library "lib"; // CHECK:STDOUT: --- main_lib_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_api_not_found.carbon b/toolchain/check/testdata/packages/fail_api_not_found.carbon index a8b009cfc3c6..e18e8e1dda51 100644 --- a/toolchain/check/testdata/packages/fail_api_not_found.carbon +++ b/toolchain/check/testdata/packages/fail_api_not_found.carbon @@ -28,18 +28,18 @@ library "Bar" impl; // CHECK:STDOUT: --- no_api.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {has_error} +// CHECK:STDOUT: package: = namespace package, {has_error} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- no_api_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {has_error} +// CHECK:STDOUT: package: = namespace package, {has_error} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- no_api_main_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {has_error} +// CHECK:STDOUT: package: = namespace package, {has_error} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_cycle.carbon b/toolchain/check/testdata/packages/fail_cycle.carbon index 7a073cb37ad2..b9a99603587b 100644 --- a/toolchain/check/testdata/packages/fail_cycle.carbon +++ b/toolchain/check/testdata/packages/fail_cycle.carbon @@ -50,7 +50,7 @@ import B; // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %B: = bind_name B, %import // CHECK:STDOUT: } @@ -58,7 +58,7 @@ import B; // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %C: = bind_name C, %import // CHECK:STDOUT: } @@ -66,7 +66,7 @@ import B; // CHECK:STDOUT: --- c.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %A: = bind_name A, %import // CHECK:STDOUT: } @@ -74,13 +74,13 @@ import B; // CHECK:STDOUT: --- c.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {has_error} +// CHECK:STDOUT: package: = namespace package, {has_error} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- cycle_child.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %B: = bind_name B, %import // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_duplicate_api.carbon b/toolchain/check/testdata/packages/fail_duplicate_api.carbon index 97bffd846230..b1b8f1118d84 100644 --- a/toolchain/check/testdata/packages/fail_duplicate_api.carbon +++ b/toolchain/check/testdata/packages/fail_duplicate_api.carbon @@ -45,48 +45,48 @@ package Package library "lib" api; // CHECK:STDOUT: --- main1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_extension.carbon b/toolchain/check/testdata/packages/fail_extension.carbon index 565c9c9678c1..4e7403b13b22 100644 --- a/toolchain/check/testdata/packages/fail_extension.carbon +++ b/toolchain/check/testdata/packages/fail_extension.carbon @@ -73,60 +73,60 @@ package SwappedExt impl; // CHECK:STDOUT: --- main.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_redundant_with_swapped_ext.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- swapped_ext.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- swapped_ext.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_import_default.carbon b/toolchain/check/testdata/packages/fail_import_default.carbon index 498c45d75849..842acb3bffd7 100644 --- a/toolchain/check/testdata/packages/fail_import_default.carbon +++ b/toolchain/check/testdata/packages/fail_import_default.carbon @@ -41,24 +41,24 @@ import library default; // CHECK:STDOUT: --- default_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- default.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_import_default.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib_import_default.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_import_invalid.carbon b/toolchain/check/testdata/packages/fail_import_invalid.carbon index 5c52004917d5..2c9a6be3e09d 100644 --- a/toolchain/check/testdata/packages/fail_import_invalid.carbon +++ b/toolchain/check/testdata/packages/fail_import_invalid.carbon @@ -85,55 +85,55 @@ import ImportNotFound; // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- not_main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- this.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- this_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_lib_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- not_found.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %ImportNotFound: = bind_name ImportNotFound, %import // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_import_repeat.carbon b/toolchain/check/testdata/packages/fail_import_repeat.carbon index abefefb502fa..d6706daf2461 100644 --- a/toolchain/check/testdata/packages/fail_import_repeat.carbon +++ b/toolchain/check/testdata/packages/fail_import_repeat.carbon @@ -61,25 +61,25 @@ import library default; // CHECK:STDOUT: --- api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %import: = import ir2, ir3 // CHECK:STDOUT: %Api: = bind_name Api, %import // CHECK:STDOUT: } @@ -87,6 +87,6 @@ import library default; // CHECK:STDOUT: --- default_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon index a4e188afc3b0..af33b521781f 100644 --- a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon +++ b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon @@ -20,7 +20,7 @@ var a: () = A(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, has_error} +// CHECK:STDOUT: package: = namespace package, {.a = %a, has_error} // CHECK:STDOUT: %.loc7_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.loc7 // CHECK:STDOUT: %a.var: ref () = var a diff --git a/toolchain/check/testdata/packages/fail_package_main.carbon b/toolchain/check/testdata/packages/fail_package_main.carbon index 907a1aecfb36..6ac286a50eb8 100644 --- a/toolchain/check/testdata/packages/fail_package_main.carbon +++ b/toolchain/check/testdata/packages/fail_package_main.carbon @@ -36,24 +36,24 @@ package Main library "lib" api; // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- raw_main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_todo_lazy_import_ref.carbon b/toolchain/check/testdata/packages/fail_todo_lazy_import_ref.carbon index a80be9867a79..ae7248ae471a 100644 --- a/toolchain/check/testdata/packages/fail_todo_lazy_import_ref.carbon +++ b/toolchain/check/testdata/packages/fail_todo_lazy_import_ref.carbon @@ -23,7 +23,7 @@ var a: () = a_ref; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %a_ref} +// CHECK:STDOUT: package: = namespace package, {.a_ref = %a_ref} // CHECK:STDOUT: %a_ref.var: ref i32 = var a_ref // CHECK:STDOUT: %a_ref: ref i32 = bind_name a_ref, %a_ref.var // CHECK:STDOUT: %.loc4: i32 = int_literal 0 @@ -37,7 +37,7 @@ var a: () = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %package.var, .a = %a} +// CHECK:STDOUT: package: = namespace package, {.a_ref = %package.var, .a = %a} // CHECK:STDOUT: %package.var: ref = var package // CHECK:STDOUT: %.loc4_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc4_9.2: type = converted %.loc4_9.1, constants.%.loc4 diff --git a/toolchain/check/testdata/packages/implicit_imports.carbon b/toolchain/check/testdata/packages/implicit_imports.carbon index 6a2be7140fa0..368974a4bff2 100644 --- a/toolchain/check/testdata/packages/implicit_imports.carbon +++ b/toolchain/check/testdata/packages/implicit_imports.carbon @@ -46,60 +46,60 @@ library "lib" impl; // CHECK:STDOUT: --- api_only.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_only_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl_extra.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/loaded_global.carbon b/toolchain/check/testdata/packages/loaded_global.carbon index b27039dd360a..f0b0e86274a0 100644 --- a/toolchain/check/testdata/packages/loaded_global.carbon +++ b/toolchain/check/testdata/packages/loaded_global.carbon @@ -37,7 +37,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} +// CHECK:STDOUT: package: = namespace package, {.A = %A} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: @@ -50,7 +50,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %.2, .a = %a, .package_a = %package_a} +// CHECK:STDOUT: package: = namespace package, {.A = %.2, .a = %a, .package_a = %package_a} // CHECK:STDOUT: %.2: = fn_decl @.1 // CHECK:STDOUT: %.loc4_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc4_9.2: type = converted %.loc4_9.1, constants.%.loc4 @@ -74,7 +74,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: --- same_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B} +// CHECK:STDOUT: package: = namespace package, {.B = %B} // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: } // CHECK:STDOUT: @@ -87,7 +87,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %.2, .b = %b, .package_b = %package_b} +// CHECK:STDOUT: package: = namespace package, {.B = %.2, .b = %b, .package_b = %package_b} // CHECK:STDOUT: %.2: = fn_decl @.1 // CHECK:STDOUT: %.loc6_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc6_9.2: type = converted %.loc6_9.1, constants.%.loc6 diff --git a/toolchain/check/testdata/packages/unused_lazy_import.carbon b/toolchain/check/testdata/packages/unused_lazy_import.carbon index e8d09c6621bd..269e60e6db15 100644 --- a/toolchain/check/testdata/packages/unused_lazy_import.carbon +++ b/toolchain/check/testdata/packages/unused_lazy_import.carbon @@ -17,7 +17,7 @@ package Implicit impl; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} +// CHECK:STDOUT: package: = namespace package, {.A = %A} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: @@ -26,7 +26,7 @@ package Implicit impl; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %lazy_import_ref} +// CHECK:STDOUT: package: = namespace package, {.A = %lazy_import_ref} // CHECK:STDOUT: %lazy_import_ref = lazy_import_ref ir1, inst+1 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/address_of_deref.carbon b/toolchain/check/testdata/pointer/address_of_deref.carbon index 7227a9c498ad..c3f569e57562 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -16,7 +16,7 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index e54b37237d46..ef2006b3efde 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -26,7 +26,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index 31f9cf35b42c..6eb1f86c9ab9 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -14,7 +14,7 @@ fn F() -> i32 { // CHECK:STDOUT: --- basic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_address_of_error.carbon b/toolchain/check/testdata/pointer/fail_address_of_error.carbon index 15e298a3f99b..a13bfab3a5db 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_error.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_error.carbon @@ -26,7 +26,7 @@ fn Test() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Test = %Test} +// CHECK:STDOUT: package: = namespace package, {.Test = %Test} // CHECK:STDOUT: %Test: = fn_decl @Test // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_address_of_value.carbon b/toolchain/check/testdata/pointer/fail_address_of_value.carbon index 731455544d2f..65467e104b7d 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_value.carbon @@ -96,7 +96,7 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G, .H = %H, .AddressOfLiteral = %AddressOfLiteral, .AddressOfOperator = %AddressOfOperator, .AddressOfCall = %AddressOfCall, .AddressOfType = %AddressOfType, .AddressOfTupleElementValue = %AddressOfTupleElementValue, .AddressOfParam = %AddressOfParam} +// CHECK:STDOUT: package: = namespace package, {.G = %G, .H = %H, .AddressOfLiteral = %AddressOfLiteral, .AddressOfOperator = %AddressOfOperator, .AddressOfCall = %AddressOfCall, .AddressOfType = %AddressOfType, .AddressOfTupleElementValue = %AddressOfTupleElementValue, .AddressOfParam = %AddressOfParam} // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %H: = fn_decl @H // CHECK:STDOUT: %AddressOfLiteral: = fn_decl @AddressOfLiteral diff --git a/toolchain/check/testdata/pointer/fail_deref_error.carbon b/toolchain/check/testdata/pointer/fail_deref_error.carbon index 41ac2d58fcd5..657c89b02f90 100644 --- a/toolchain/check/testdata/pointer/fail_deref_error.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_error.carbon @@ -12,7 +12,7 @@ let n: i32 = *undeclared; // CHECK:STDOUT: --- fail_deref_error.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: %undeclared.ref: = name_ref undeclared, // CHECK:STDOUT: %.loc10: ref = deref // CHECK:STDOUT: %n: i32 = bind_name n, diff --git a/toolchain/check/testdata/pointer/fail_deref_function.carbon b/toolchain/check/testdata/pointer/fail_deref_function.carbon index f49923e29c11..d09abb144d3f 100644 --- a/toolchain/check/testdata/pointer/fail_deref_function.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_function.carbon @@ -14,7 +14,7 @@ fn A() { // CHECK:STDOUT: --- fail_deref_function.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} +// CHECK:STDOUT: package: = namespace package, {.A = %A} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon index a860e32a0f18..80addd8a1fdc 100644 --- a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: --- fail_deref_namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %.loc7, .F = %F} -// CHECK:STDOUT: %.loc7: = namespace {} +// CHECK:STDOUT: package: = namespace package, {.A = %.loc7, .F = %F} +// CHECK:STDOUT: %.loc7: = namespace A, {} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon index eb8b933b6292..b4779fdcf748 100644 --- a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon @@ -27,7 +27,7 @@ fn Deref(n: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Deref = %Deref} +// CHECK:STDOUT: package: = namespace package, {.Deref = %Deref} // CHECK:STDOUT: %Deref: = fn_decl @Deref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_type.carbon b/toolchain/check/testdata/pointer/fail_deref_type.carbon index f2e6fc03e7a5..4af437f7edab 100644 --- a/toolchain/check/testdata/pointer/fail_deref_type.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_type.carbon @@ -15,7 +15,7 @@ var p: *i32; // CHECK:STDOUT: --- fail_deref_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.p = %p} +// CHECK:STDOUT: package: = namespace package, {.p = %p} // CHECK:STDOUT: %.loc13: ref = deref i32 // CHECK:STDOUT: %p.var: ref = var p // CHECK:STDOUT: %p: ref = bind_name p, %p.var diff --git a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon index 6f8fe46820d1..f81041f61371 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -18,7 +18,7 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.ConstMismatch = %ConstMismatch} +// CHECK:STDOUT: package: = namespace package, {.ConstMismatch = %ConstMismatch} // CHECK:STDOUT: %ConstMismatch: = fn_decl @ConstMismatch // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/nested_const.carbon b/toolchain/check/testdata/pointer/nested_const.carbon index a0e552329492..f8f692876e01 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -12,7 +12,7 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: --- nested_const.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index 194b540abc7e..dc225a8468b6 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -15,7 +15,7 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: --- types.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Ptr = %Ptr, .ConstPtr = %ConstPtr} +// CHECK:STDOUT: package: = namespace package, {.Ptr = %Ptr, .ConstPtr = %ConstPtr} // CHECK:STDOUT: %Ptr: = fn_decl @Ptr // CHECK:STDOUT: %ConstPtr: = fn_decl @ConstPtr // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/code_after_return.carbon b/toolchain/check/testdata/return/code_after_return.carbon index a2b72703b219..e29e10aa2405 100644 --- a/toolchain/check/testdata/return/code_after_return.carbon +++ b/toolchain/check/testdata/return/code_after_return.carbon @@ -12,7 +12,7 @@ fn Main() { // CHECK:STDOUT: --- code_after_return.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/code_after_return_value.carbon b/toolchain/check/testdata/return/code_after_return_value.carbon index 4fbcd2e4b970..09f9d001a6bf 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -19,7 +19,7 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: --- code_after_return_value.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_call_in_type.carbon b/toolchain/check/testdata/return/fail_call_in_type.carbon index aff17ced5294..48230d5c301a 100644 --- a/toolchain/check/testdata/return/fail_call_in_type.carbon +++ b/toolchain/check/testdata/return/fail_call_in_type.carbon @@ -15,7 +15,7 @@ fn Six() -> ReturnType() { return 6; } // CHECK:STDOUT: --- fail_call_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.ReturnType = %ReturnType, .Six = %Six} +// CHECK:STDOUT: package: = namespace package, {.ReturnType = %ReturnType, .Six = %Six} // CHECK:STDOUT: %ReturnType: = fn_decl @ReturnType // CHECK:STDOUT: %Six: = fn_decl @Six // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_error_in_type.carbon b/toolchain/check/testdata/return/fail_error_in_type.carbon index aa5523dcd0d1..d70b47bd917a 100644 --- a/toolchain/check/testdata/return/fail_error_in_type.carbon +++ b/toolchain/check/testdata/return/fail_error_in_type.carbon @@ -12,7 +12,7 @@ fn Six() -> x; // CHECK:STDOUT: --- fail_error_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Six = %Six} +// CHECK:STDOUT: package: = namespace package, {.Six = %Six} // CHECK:STDOUT: %Six: = fn_decl @Six // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_let_in_type.carbon b/toolchain/check/testdata/return/fail_let_in_type.carbon index 0a95a3fbf4d6..5b1120acf947 100644 --- a/toolchain/check/testdata/return/fail_let_in_type.carbon +++ b/toolchain/check/testdata/return/fail_let_in_type.carbon @@ -14,7 +14,7 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: --- fail_let_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Six = %Six} +// CHECK:STDOUT: package: = namespace package, {.Six = %Six} // CHECK:STDOUT: %x: type = bind_name x, i32 // CHECK:STDOUT: %Six: = fn_decl @Six // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_missing_return.carbon b/toolchain/check/testdata/return/fail_missing_return.carbon index 742afa388141..7dfd0194a374 100644 --- a/toolchain/check/testdata/return/fail_missing_return.carbon +++ b/toolchain/check/testdata/return/fail_missing_return.carbon @@ -13,7 +13,7 @@ fn Main() -> i32 { // CHECK:STDOUT: --- fail_missing_return.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon index 45a728cf1f60..b60742b215a8 100644 --- a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon +++ b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon @@ -17,7 +17,7 @@ fn F() -> () { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon index c85d8a1ef13a..3b84b63da0c1 100644 --- a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon @@ -14,7 +14,7 @@ fn Procedure() -> i32 { // CHECK:STDOUT: --- fail_return_var_no_returned_var.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Procedure = %Procedure} +// CHECK:STDOUT: package: = namespace package, {.Procedure = %Procedure} // CHECK:STDOUT: %Procedure: = fn_decl @Procedure // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon index 37face5c7b20..f4c261b84758 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -35,7 +35,7 @@ fn G() -> C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .C = %C.decl, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .C = %C.decl, .G = %G} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: %C: type = class_type @C diff --git a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon index c64e5179c405..7ccb5de87320 100644 --- a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon @@ -22,7 +22,7 @@ fn Procedure() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Procedure = %Procedure} +// CHECK:STDOUT: package: = namespace package, {.Procedure = %Procedure} // CHECK:STDOUT: %Procedure: = fn_decl @Procedure // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index 273f8fb450d2..781f5e02affc 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -37,7 +37,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: --- fail_returned_var_shadow.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.SameScope = %SameScope, .DifferentScopes = %DifferentScopes} +// CHECK:STDOUT: package: = namespace package, {.SameScope = %SameScope, .DifferentScopes = %DifferentScopes} // CHECK:STDOUT: %SameScope: = fn_decl @SameScope // CHECK:STDOUT: %DifferentScopes: = fn_decl @DifferentScopes // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_returned_var_type.carbon b/toolchain/check/testdata/return/fail_returned_var_type.carbon index 218ba871c134..d322f3fab728 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -18,7 +18,7 @@ fn Mismatch() -> i32 { // CHECK:STDOUT: --- fail_returned_var_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Mismatch = %Mismatch} +// CHECK:STDOUT: package: = namespace package, {.Mismatch = %Mismatch} // CHECK:STDOUT: %Mismatch: = fn_decl @Mismatch // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_type_mismatch.carbon b/toolchain/check/testdata/return/fail_type_mismatch.carbon index ac16774a99f1..3bce022a2567 100644 --- a/toolchain/check/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/return/fail_type_mismatch.carbon @@ -14,7 +14,7 @@ fn Main() -> i32 { // CHECK:STDOUT: --- fail_type_mismatch.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_value_disallowed.carbon b/toolchain/check/testdata/return/fail_value_disallowed.carbon index 17492b9744b2..453f1cb2684c 100644 --- a/toolchain/check/testdata/return/fail_value_disallowed.carbon +++ b/toolchain/check/testdata/return/fail_value_disallowed.carbon @@ -17,7 +17,7 @@ fn Main() { // CHECK:STDOUT: --- fail_value_disallowed.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_value_missing.carbon b/toolchain/check/testdata/return/fail_value_missing.carbon index b0cc10cbec71..19e1dc53f3f2 100644 --- a/toolchain/check/testdata/return/fail_value_missing.carbon +++ b/toolchain/check/testdata/return/fail_value_missing.carbon @@ -17,7 +17,7 @@ fn Main() -> i32 { // CHECK:STDOUT: --- fail_value_missing.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_var_in_type.carbon b/toolchain/check/testdata/return/fail_var_in_type.carbon index 1d09681103aa..7ea5143f5bec 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -13,7 +13,7 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: --- fail_var_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .Six = %Six} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .Six = %Six} // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var // CHECK:STDOUT: assign %x.var, i32 diff --git a/toolchain/check/testdata/return/missing_return_no_return_type.carbon b/toolchain/check/testdata/return/missing_return_no_return_type.carbon index 8f0edf4811fd..ce5ef9e2ef34 100644 --- a/toolchain/check/testdata/return/missing_return_no_return_type.carbon +++ b/toolchain/check/testdata/return/missing_return_no_return_type.carbon @@ -10,7 +10,7 @@ fn F() { // CHECK:STDOUT: --- missing_return_no_return_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/no_value.carbon b/toolchain/check/testdata/return/no_value.carbon index 2d77a7ecc27b..6e93dd5cae92 100644 --- a/toolchain/check/testdata/return/no_value.carbon +++ b/toolchain/check/testdata/return/no_value.carbon @@ -11,7 +11,7 @@ fn Main() { // CHECK:STDOUT: --- no_value.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index 9d68760e7f03..98bc87815a15 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -27,7 +27,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.C = %C.decl, .F = %F, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.C = %C.decl, .F = %F, .G = %G} // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: %C: type = class_type @C // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index 4b3f1fdada5b..a93917dea7e7 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -26,7 +26,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: --- returned_var_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.UnrelatedScopes = %UnrelatedScopes, .EnclosingButAfter = %EnclosingButAfter} +// CHECK:STDOUT: package: = namespace package, {.UnrelatedScopes = %UnrelatedScopes, .EnclosingButAfter = %EnclosingButAfter} // CHECK:STDOUT: %UnrelatedScopes: = fn_decl @UnrelatedScopes // CHECK:STDOUT: %EnclosingButAfter: = fn_decl @EnclosingButAfter // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/struct.carbon b/toolchain/check/testdata/return/struct.carbon index 6555efd50c40..cfb83528ab76 100644 --- a/toolchain/check/testdata/return/struct.carbon +++ b/toolchain/check/testdata/return/struct.carbon @@ -11,7 +11,7 @@ fn Main() -> {.a: i32} { // CHECK:STDOUT: --- struct.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/tuple.carbon b/toolchain/check/testdata/return/tuple.carbon index a2a83916b18f..c5c0553751f7 100644 --- a/toolchain/check/testdata/return/tuple.carbon +++ b/toolchain/check/testdata/return/tuple.carbon @@ -18,7 +18,7 @@ fn Main() -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/value.carbon b/toolchain/check/testdata/return/value.carbon index 6f7b1b1a97c9..bbc952b6bb47 100644 --- a/toolchain/check/testdata/return/value.carbon +++ b/toolchain/check/testdata/return/value.carbon @@ -11,7 +11,7 @@ fn Main() -> i32 { // CHECK:STDOUT: --- value.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/empty.carbon b/toolchain/check/testdata/struct/empty.carbon index 6842a2f3fc3a..e45281b4264c 100644 --- a/toolchain/check/testdata/struct/empty.carbon +++ b/toolchain/check/testdata/struct/empty.carbon @@ -15,7 +15,7 @@ var y: {} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc7_9.1: {} = struct_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.loc7_9.1 // CHECK:STDOUT: %x.var: ref {} = var x diff --git a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon index 3e1a4fc3a7e2..07e5dddc312d 100644 --- a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon @@ -13,7 +13,7 @@ fn F() { a.b; } // CHECK:STDOUT: --- fail_access_into_invalid.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} +// CHECK:STDOUT: package: = namespace package, {.F = %F} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_assign_empty.carbon b/toolchain/check/testdata/struct/fail_assign_empty.carbon index 8ef76657190c..bcfa7e4431e8 100644 --- a/toolchain/check/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_empty.carbon @@ -16,7 +16,7 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_assign_nested.carbon b/toolchain/check/testdata/struct/fail_assign_nested.carbon index 67f211f02823..b5409abcc6ad 100644 --- a/toolchain/check/testdata/struct/fail_assign_nested.carbon +++ b/toolchain/check/testdata/struct/fail_assign_nested.carbon @@ -19,7 +19,7 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_14.1: {} = struct_literal () // CHECK:STDOUT: %.loc10_14.2: type = converted %.loc10_14.1, constants.%.loc10_14.1 // CHECK:STDOUT: %.loc10_15: type = struct_type {.a: {}} diff --git a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon index 6361e262f7e8..70a790b94a44 100644 --- a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon @@ -18,7 +18,7 @@ var x: {} = {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_9.1: {} = struct_literal () // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_9.1, constants.%.loc10_9.1 // CHECK:STDOUT: %x.var: ref {} = var x diff --git a/toolchain/check/testdata/struct/fail_duplicate_name.carbon b/toolchain/check/testdata/struct/fail_duplicate_name.carbon index 3f74e555f0dd..029697e8cf2c 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -52,7 +52,7 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .x = %x, .y = %y} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %.loc21_35: i32 = int_literal 1 // CHECK:STDOUT: %.loc21_36: {.a: i32} = struct_literal (%.loc21_35) diff --git a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon index 8cff23b368e0..7ba47545eb09 100644 --- a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon @@ -21,7 +21,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon index af1482dc39cc..99ed5a2f33b1 100644 --- a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon @@ -16,7 +16,7 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_member_access_type.carbon b/toolchain/check/testdata/struct/fail_member_access_type.carbon index 56a966202bdd..de0b0fa67289 100644 --- a/toolchain/check/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/check/testdata/struct/fail_member_access_type.carbon @@ -13,7 +13,7 @@ var y: i32 = x.b; // CHECK:STDOUT: --- fail_member_access_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: f64} // CHECK:STDOUT: %x.var: ref {.a: f64} = var x // CHECK:STDOUT: %x: ref {.a: f64} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_member_of_function.carbon b/toolchain/check/testdata/struct/fail_member_of_function.carbon index 0a784fa50114..d97ae1dd11c3 100644 --- a/toolchain/check/testdata/struct/fail_member_of_function.carbon +++ b/toolchain/check/testdata/struct/fail_member_of_function.carbon @@ -14,7 +14,7 @@ fn A() { // CHECK:STDOUT: --- fail_member_of_function.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} +// CHECK:STDOUT: package: = namespace package, {.A = %A} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon index 843de739e5ac..c1c1aebccbd3 100644 --- a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon @@ -26,7 +26,7 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Incomplete = %Incomplete.decl, .s = %s, .p = %p} +// CHECK:STDOUT: package: = namespace package, {.Incomplete = %Incomplete.decl, .s = %s, .p = %p} // CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete, () // CHECK:STDOUT: %Incomplete: type = class_type @Incomplete // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete diff --git a/toolchain/check/testdata/struct/fail_non_member_access.carbon b/toolchain/check/testdata/struct/fail_non_member_access.carbon index b8a0a991faf5..1fd693b57e59 100644 --- a/toolchain/check/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/check/testdata/struct/fail_non_member_access.carbon @@ -13,7 +13,7 @@ var y: i32 = x.b; // CHECK:STDOUT: --- fail_non_member_access.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_too_few_values.carbon b/toolchain/check/testdata/struct/fail_too_few_values.carbon index 23f2f313159b..1c9d5f330e9b 100644 --- a/toolchain/check/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/check/testdata/struct/fail_too_few_values.carbon @@ -17,7 +17,7 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_25: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %x.var: ref {.a: i32, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32, .b: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_type_assign.carbon b/toolchain/check/testdata/struct/fail_type_assign.carbon index 9ab24b19759a..e89021814647 100644 --- a/toolchain/check/testdata/struct/fail_type_assign.carbon +++ b/toolchain/check/testdata/struct/fail_type_assign.carbon @@ -12,7 +12,7 @@ var x: {.a: i32} = {.a: i32}; // CHECK:STDOUT: --- fail_type_assign.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_value_as_type.carbon b/toolchain/check/testdata/struct/fail_value_as_type.carbon index 6b4b843fdf2a..6882d160481e 100644 --- a/toolchain/check/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/check/testdata/struct/fail_value_as_type.carbon @@ -16,7 +16,7 @@ var x: {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_15: {.a: i32} = struct_literal (%.loc10_14) // CHECK:STDOUT: %x.var: ref = var x diff --git a/toolchain/check/testdata/struct/literal_member_access.carbon b/toolchain/check/testdata/struct/literal_member_access.carbon index 04176bd76bd3..123e109775ae 100644 --- a/toolchain/check/testdata/struct/literal_member_access.carbon +++ b/toolchain/check/testdata/struct/literal_member_access.carbon @@ -20,7 +20,7 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.G = %G, .F = %F} // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/member_access.carbon b/toolchain/check/testdata/struct/member_access.carbon index c628dd1696a5..56e0e6ba4ac6 100644 --- a/toolchain/check/testdata/struct/member_access.carbon +++ b/toolchain/check/testdata/struct/member_access.carbon @@ -15,7 +15,7 @@ var z: i32 = y; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y, .z = %z} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y, .z = %z} // CHECK:STDOUT: %.loc7_25: type = struct_type {.a: f64, .b: i32} // CHECK:STDOUT: %x.var: ref {.a: f64, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: f64, .b: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/nested_struct_in_place.carbon b/toolchain/check/testdata/struct/nested_struct_in_place.carbon index ecb4be020ff9..64e891d88ac8 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -21,7 +21,7 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/one_entry.carbon b/toolchain/check/testdata/struct/one_entry.carbon index e7f29c1c2fdb..c9d4a1c1e2c2 100644 --- a/toolchain/check/testdata/struct/one_entry.carbon +++ b/toolchain/check/testdata/struct/one_entry.carbon @@ -10,7 +10,7 @@ var y: {.a: i32} = x; // CHECK:STDOUT: --- one_entry.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/reorder_fields.carbon b/toolchain/check/testdata/struct/reorder_fields.carbon index 8176cf857c24..70164400e1aa 100644 --- a/toolchain/check/testdata/struct/reorder_fields.carbon +++ b/toolchain/check/testdata/struct/reorder_fields.carbon @@ -22,7 +22,7 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.MakeI32 = %MakeI32, .MakeF64 = %MakeF64, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.MakeI32 = %MakeI32, .MakeF64 = %MakeF64, .F = %F} // CHECK:STDOUT: %MakeI32: = fn_decl @MakeI32 // CHECK:STDOUT: %MakeF64: = fn_decl @MakeF64 // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/struct/tuple_as_element.carbon b/toolchain/check/testdata/struct/tuple_as_element.carbon index 798a6fb750bf..7a81db00c214 100644 --- a/toolchain/check/testdata/struct/tuple_as_element.carbon +++ b/toolchain/check/testdata/struct/tuple_as_element.carbon @@ -16,7 +16,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc7_27.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_27.2: type = converted %.loc7_27.1, constants.%.loc7_27.2 // CHECK:STDOUT: %.loc7_28: type = struct_type {.a: i32, .b: (i32,)} diff --git a/toolchain/check/testdata/struct/two_entries.carbon b/toolchain/check/testdata/struct/two_entries.carbon index 71fe23c70012..24078283f4d5 100644 --- a/toolchain/check/testdata/struct/two_entries.carbon +++ b/toolchain/check/testdata/struct/two_entries.carbon @@ -14,7 +14,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc7_25: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %x.var: ref {.a: i32, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32, .b: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/tuples/empty.carbon b/toolchain/check/testdata/tuples/empty.carbon index d072bf7ffa85..368209511b75 100644 --- a/toolchain/check/testdata/tuples/empty.carbon +++ b/toolchain/check/testdata/tuples/empty.carbon @@ -14,7 +14,7 @@ var y: () = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc7_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.loc7 // CHECK:STDOUT: %x.var: ref () = var x diff --git a/toolchain/check/testdata/tuples/fail_assign_empty.carbon b/toolchain/check/testdata/tuples/fail_assign_empty.carbon index 1bb1fcd467b2..3f8a9f1aad67 100644 --- a/toolchain/check/testdata/tuples/fail_assign_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_empty.carbon @@ -18,7 +18,7 @@ var x: (i32,) = (); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc10_13.2: type = converted %.loc10_13.1, constants.%.loc10_13.2 // CHECK:STDOUT: %x.var: ref (i32,) = var x diff --git a/toolchain/check/testdata/tuples/fail_assign_nested.carbon b/toolchain/check/testdata/tuples/fail_assign_nested.carbon index 3e60ea333be5..1fca25c0b938 100644 --- a/toolchain/check/testdata/tuples/fail_assign_nested.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_nested.carbon @@ -24,7 +24,7 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_18: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_30: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_31.1: ((type, type), (type, type)) = tuple_literal (%.loc10_18, %.loc10_30) diff --git a/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon b/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon index 46309bcfcd4d..69947cfba51f 100644 --- a/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon @@ -16,7 +16,7 @@ var x: () = (66); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_9.1, constants.%.loc10 // CHECK:STDOUT: %x.var: ref () = var x diff --git a/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon b/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon index 40209b28675c..21f9b2f5d8ff 100644 --- a/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon +++ b/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon @@ -19,7 +19,7 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.loc10_17.2 // CHECK:STDOUT: %x.var: ref (i32, i32) = var x diff --git a/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon b/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon index 149f126b00a3..019a48f842ce 100644 --- a/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon @@ -28,7 +28,7 @@ var p: Incomplete* = &t[1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Incomplete = %Incomplete.decl, .t = %t, .p = %p} +// CHECK:STDOUT: package: = namespace package, {.Incomplete = %Incomplete.decl, .t = %t, .p = %p} // CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete, () // CHECK:STDOUT: %Incomplete: type = class_type @Incomplete // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete diff --git a/toolchain/check/testdata/tuples/fail_too_few_element.carbon b/toolchain/check/testdata/tuples/fail_too_few_element.carbon index 7b544de96c88..59ed40e7bc56 100644 --- a/toolchain/check/testdata/tuples/fail_too_few_element.carbon +++ b/toolchain/check/testdata/tuples/fail_too_few_element.carbon @@ -19,7 +19,7 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.loc10_17.2 // CHECK:STDOUT: %x.var: ref (i32, i32) = var x diff --git a/toolchain/check/testdata/tuples/fail_type_assign.carbon b/toolchain/check/testdata/tuples/fail_type_assign.carbon index 791d7ad5dc15..2dd4c3067a09 100644 --- a/toolchain/check/testdata/tuples/fail_type_assign.carbon +++ b/toolchain/check/testdata/tuples/fail_type_assign.carbon @@ -17,7 +17,7 @@ var x: (i32, ) = (i32, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_14.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc10_14.2: type = converted %.loc10_14.1, constants.%.loc10_14.2 // CHECK:STDOUT: %x.var: ref (i32,) = var x diff --git a/toolchain/check/testdata/tuples/fail_value_as_type.carbon b/toolchain/check/testdata/tuples/fail_value_as_type.carbon index 040e9063ba48..9c3540a9c4fa 100644 --- a/toolchain/check/testdata/tuples/fail_value_as_type.carbon +++ b/toolchain/check/testdata/tuples/fail_value_as_type.carbon @@ -17,7 +17,7 @@ var x: (1, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_12.1: (i32,) = tuple_literal (%.loc10_9) // CHECK:STDOUT: %.loc10_12.2: type = converted %.loc10_12.1, constants.%.loc10_12.2 diff --git a/toolchain/check/testdata/tuples/nested_tuple.carbon b/toolchain/check/testdata/tuples/nested_tuple.carbon index 10fa5674d517..e0eb204f4898 100644 --- a/toolchain/check/testdata/tuples/nested_tuple.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple.carbon @@ -19,7 +19,7 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %.loc7_18: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_24.1: ((type, type), type) = tuple_literal (%.loc7_18, i32) // CHECK:STDOUT: %.loc7_24.2: type = converted %.loc7_18, constants.%.loc7_24.2 diff --git a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon index d80dc168562b..a4cc408bbb18 100644 --- a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon @@ -31,7 +31,7 @@ fn H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .H = %H} +// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .H = %H} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %H: = fn_decl @H diff --git a/toolchain/check/testdata/tuples/one_element.carbon b/toolchain/check/testdata/tuples/one_element.carbon index fe5f12b945f3..a3861f7de0d7 100644 --- a/toolchain/check/testdata/tuples/one_element.carbon +++ b/toolchain/check/testdata/tuples/one_element.carbon @@ -15,7 +15,7 @@ var y: (i32,) = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.loc7_13.2 // CHECK:STDOUT: %x.var: ref (i32,) = var x diff --git a/toolchain/check/testdata/tuples/two_elements.carbon b/toolchain/check/testdata/tuples/two_elements.carbon index 0aee410e6c9c..3869305837d0 100644 --- a/toolchain/check/testdata/tuples/two_elements.carbon +++ b/toolchain/check/testdata/tuples/two_elements.carbon @@ -16,7 +16,7 @@ var y: (i32, i32) = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %x.var: ref (i32, i32) = var x diff --git a/toolchain/check/testdata/var/decl.carbon b/toolchain/check/testdata/var/decl.carbon index 510bbbbf6ecc..329742c49dba 100644 --- a/toolchain/check/testdata/var/decl.carbon +++ b/toolchain/check/testdata/var/decl.carbon @@ -11,7 +11,7 @@ fn Main() { // CHECK:STDOUT: --- decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/decl_with_init.carbon b/toolchain/check/testdata/var/decl_with_init.carbon index fec7490f0b98..95a57dbb2413 100644 --- a/toolchain/check/testdata/var/decl_with_init.carbon +++ b/toolchain/check/testdata/var/decl_with_init.carbon @@ -11,7 +11,7 @@ fn Main() { // CHECK:STDOUT: --- decl_with_init.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_duplicate_decl.carbon b/toolchain/check/testdata/var/fail_duplicate_decl.carbon index 8622752103fc..d03deb7ef620 100644 --- a/toolchain/check/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/var/fail_duplicate_decl.carbon @@ -19,7 +19,7 @@ fn Main() { // CHECK:STDOUT: --- fail_duplicate_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_generic.carbon b/toolchain/check/testdata/var/fail_generic.carbon index 4b7cbdfc30d4..66efcb3559a3 100644 --- a/toolchain/check/testdata/var/fail_generic.carbon +++ b/toolchain/check/testdata/var/fail_generic.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_generic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon index 7018802c55d7..2371066f6e36 100644 --- a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_init_type_mismatch.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_init_with_self.carbon b/toolchain/check/testdata/var/fail_init_with_self.carbon index 401bd63d623a..93b24b55b682 100644 --- a/toolchain/check/testdata/var/fail_init_with_self.carbon +++ b/toolchain/check/testdata/var/fail_init_with_self.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_init_with_self.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon index 2a95c25f7a06..34b5501c62a4 100644 --- a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon @@ -16,7 +16,7 @@ var y: i32 = x; // CHECK:STDOUT: --- fail_lookup_outside_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main, .y = %y} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: %y.var: ref i32 = var y // CHECK:STDOUT: %y: ref i32 = bind_name y, %y.var diff --git a/toolchain/check/testdata/var/fail_modifiers.carbon b/toolchain/check/testdata/var/fail_modifiers.carbon index b2277b6e4a89..c8c7d0fe3175 100644 --- a/toolchain/check/testdata/var/fail_modifiers.carbon +++ b/toolchain/check/testdata/var/fail_modifiers.carbon @@ -39,7 +39,7 @@ abstract var e: i32; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.b = %b, .c = %c, .d = %d, .e = %e} +// CHECK:STDOUT: package: = namespace package, {.b = %b, .c = %c, .d = %d, .e = %e} // CHECK:STDOUT: %b.var: ref i32 = var b // CHECK:STDOUT: %b: ref i32 = bind_name b, %b.var // CHECK:STDOUT: %c.var: ref i32 = var c diff --git a/toolchain/check/testdata/var/fail_not_copyable.carbon b/toolchain/check/testdata/var/fail_not_copyable.carbon index b02d8ac590a4..06e94cf3fc26 100644 --- a/toolchain/check/testdata/var/fail_not_copyable.carbon +++ b/toolchain/check/testdata/var/fail_not_copyable.carbon @@ -32,7 +32,7 @@ fn F(x: X) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.X = %X.decl, .F = %F} +// CHECK:STDOUT: package: = namespace package, {.X = %X.decl, .F = %F} // CHECK:STDOUT: %X.decl = class_decl @X, () // CHECK:STDOUT: %X: type = class_type @X // CHECK:STDOUT: %F: = fn_decl @F diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index c7da5c5ec50a..57e6b7afef12 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_storage_is_literal.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_todo_modifiers.carbon b/toolchain/check/testdata/var/fail_todo_modifiers.carbon index bcd490085126..d81afd0448f4 100644 --- a/toolchain/check/testdata/var/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/var/fail_todo_modifiers.carbon @@ -12,7 +12,7 @@ private var a: i32; // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} +// CHECK:STDOUT: package: = namespace package, {.a = %a} // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/global_decl.carbon b/toolchain/check/testdata/var/global_decl.carbon index fbe89ef356a9..f666e682e71b 100644 --- a/toolchain/check/testdata/var/global_decl.carbon +++ b/toolchain/check/testdata/var/global_decl.carbon @@ -9,7 +9,7 @@ var x: i32; // CHECK:STDOUT: --- global_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/global_decl_with_init.carbon b/toolchain/check/testdata/var/global_decl_with_init.carbon index 1565c633de42..a3c17015f451 100644 --- a/toolchain/check/testdata/var/global_decl_with_init.carbon +++ b/toolchain/check/testdata/var/global_decl_with_init.carbon @@ -9,7 +9,7 @@ var x: i32 = 0; // CHECK:STDOUT: --- global_decl_with_init.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} +// CHECK:STDOUT: package: = namespace package, {.x = %x} // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 diff --git a/toolchain/check/testdata/var/global_lookup.carbon b/toolchain/check/testdata/var/global_lookup.carbon index 385d3f1171a7..0f9f5e4d293f 100644 --- a/toolchain/check/testdata/var/global_lookup.carbon +++ b/toolchain/check/testdata/var/global_lookup.carbon @@ -10,7 +10,7 @@ var y: i32 = x; // CHECK:STDOUT: --- global_lookup.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 diff --git a/toolchain/check/testdata/var/global_lookup_in_scope.carbon b/toolchain/check/testdata/var/global_lookup_in_scope.carbon index db49bd601291..7eba2df96a58 100644 --- a/toolchain/check/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/check/testdata/var/global_lookup_in_scope.carbon @@ -13,7 +13,7 @@ fn Main() { // CHECK:STDOUT: --- global_lookup_in_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.x = %x, .Main = %Main} // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 diff --git a/toolchain/check/testdata/var/lookup.carbon b/toolchain/check/testdata/var/lookup.carbon index 20c447206074..1004b92c89cb 100644 --- a/toolchain/check/testdata/var/lookup.carbon +++ b/toolchain/check/testdata/var/lookup.carbon @@ -12,7 +12,7 @@ fn Main() { // CHECK:STDOUT: --- lookup.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/shadowing.carbon b/toolchain/check/testdata/var/shadowing.carbon index 9fca0a8fce34..20628d8c618b 100644 --- a/toolchain/check/testdata/var/shadowing.carbon +++ b/toolchain/check/testdata/var/shadowing.carbon @@ -17,7 +17,7 @@ fn Main() { // CHECK:STDOUT: --- shadowing.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} +// CHECK:STDOUT: package: = namespace package, {.Main = %Main} // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/break_continue.carbon b/toolchain/check/testdata/while/break_continue.carbon index a0ec28ffe8b3..e38c74dd5afd 100644 --- a/toolchain/check/testdata/while/break_continue.carbon +++ b/toolchain/check/testdata/while/break_continue.carbon @@ -29,7 +29,7 @@ fn While() { // CHECK:STDOUT: --- break_continue.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .C = %C, .D = %D, .E = %E, .F = %F, .G = %G, .H = %H, .While = %While} +// CHECK:STDOUT: package: = namespace package, {.A = %A, .B = %B, .C = %C, .D = %D, .E = %E, .F = %F, .G = %G, .H = %H, .While = %While} // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: %C: = fn_decl @C diff --git a/toolchain/check/testdata/while/fail_bad_condition.carbon b/toolchain/check/testdata/while/fail_bad_condition.carbon index f2cbfe9e2290..d3f6a5a93270 100644 --- a/toolchain/check/testdata/while/fail_bad_condition.carbon +++ b/toolchain/check/testdata/while/fail_bad_condition.carbon @@ -18,7 +18,7 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.While = %While} +// CHECK:STDOUT: package: = namespace package, {.While = %While} // CHECK:STDOUT: %While: = fn_decl @While // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/fail_break_continue.carbon b/toolchain/check/testdata/while/fail_break_continue.carbon index 9f75e2d0334a..3c90a3ee6607 100644 --- a/toolchain/check/testdata/while/fail_break_continue.carbon +++ b/toolchain/check/testdata/while/fail_break_continue.carbon @@ -30,7 +30,7 @@ fn While() { // CHECK:STDOUT: --- fail_break_continue.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.While = %While} +// CHECK:STDOUT: package: = namespace package, {.While = %While} // CHECK:STDOUT: %While: = fn_decl @While // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/unreachable_end.carbon b/toolchain/check/testdata/while/unreachable_end.carbon index 3cd61c7047c1..06d5d5769501 100644 --- a/toolchain/check/testdata/while/unreachable_end.carbon +++ b/toolchain/check/testdata/while/unreachable_end.carbon @@ -26,7 +26,7 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} +// CHECK:STDOUT: package: = namespace package, {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} // CHECK:STDOUT: %Cond: = fn_decl @Cond // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G diff --git a/toolchain/check/testdata/while/while.carbon b/toolchain/check/testdata/while/while.carbon index 77f086694847..0233afda9050 100644 --- a/toolchain/check/testdata/while/while.carbon +++ b/toolchain/check/testdata/while/while.carbon @@ -25,7 +25,7 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} +// CHECK:STDOUT: package: = namespace package, {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} // CHECK:STDOUT: %Cond: = fn_decl @Cond // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G diff --git a/toolchain/driver/testdata/stdin.carbon b/toolchain/driver/testdata/stdin.carbon index c226c81829ef..00ebdc0f43ed 100644 --- a/toolchain/driver/testdata/stdin.carbon +++ b/toolchain/driver/testdata/stdin.carbon @@ -9,6 +9,6 @@ // CHECK:STDOUT: --- // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} +// CHECK:STDOUT: package: = namespace package, {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/sem_ir/file.cpp b/toolchain/sem_ir/file.cpp index 6050aedce1e3..dd1f5d599dd1 100644 --- a/toolchain/sem_ir/file.cpp +++ b/toolchain/sem_ir/file.cpp @@ -150,6 +150,7 @@ auto File::OutputYaml(bool include_builtins) const -> Yaml::OutputMapping { map.Add("sem_ir", Yaml::OutputMapping([&](Yaml::OutputMapping::Map map) { map.Add("cross_ref_irs_size", Yaml::OutputScalar(cross_ref_irs_.size())); + map.Add("name_scopes", name_scopes_.OutputYaml()); map.Add("bind_names", bind_names_.OutputYaml()); map.Add("functions", functions_.OutputYaml()); map.Add("classes", classes_.OutputYaml()); diff --git a/toolchain/sem_ir/file.h b/toolchain/sem_ir/file.h index 26485071a3b5..3d615ffee90b 100644 --- a/toolchain/sem_ir/file.h +++ b/toolchain/sem_ir/file.h @@ -23,15 +23,17 @@ struct BindNameInfo : public Printable { << "}"; } + // The name. NameId name_id; + // The enclosing scope. NameScopeId enclosing_scope_id; }; // A function. struct Function : public Printable { auto Print(llvm::raw_ostream& out) const -> void { - out << "{name: " << name_id << ", " - << "param_refs: " << param_refs_id; + out << "{name: " << name_id << ", enclosing_scope: " << enclosing_scope_id + << ", param_refs: " << param_refs_id; if (return_type_id.is_valid()) { out << ", return_type: " << return_type_id; } @@ -54,6 +56,8 @@ struct Function : public Printable { // The function name. NameId name_id; + // The enclosing scope. + NameScopeId enclosing_scope_id; // The first declaration of the function. This is a FunctionDecl. InstId decl_id = InstId::Invalid; // The definition, if the function has been defined or is currently being @@ -89,8 +93,8 @@ struct Class : public Printable { }; auto Print(llvm::raw_ostream& out) const -> void { - out << "{name: " << name_id; - out << "}"; + out << "{name: " << name_id << ", enclosing_scope: " << enclosing_scope_id + << "}"; } // Determines whether this class has been fully defined. This is false until @@ -102,6 +106,8 @@ struct Class : public Printable { // The class name. NameId name_id; + // The enclosing scope. + NameScopeId enclosing_scope_id; // The class type, which is the type of `Self` in the class definition. TypeId self_type_id; // The first declaration of the class. This is a ClassDecl. @@ -136,8 +142,8 @@ struct Class : public Printable { // An interface. struct Interface : public Printable { auto Print(llvm::raw_ostream& out) const -> void { - out << "{name: " << name_id; - out << "}"; + out << "{name: " << name_id << ", enclosing_scope: " << enclosing_scope_id + << "}"; } // Determines whether this interface has been fully defined. This is false @@ -149,6 +155,8 @@ struct Interface : public Printable { // The interface name. NameId name_id; + // The enclosing scope. + NameScopeId enclosing_scope_id; // TODO: TypeId self_type_id; // The first declaration of the interface. This is a InterfaceDecl. InstId decl_id = InstId::Invalid; diff --git a/toolchain/sem_ir/ids.h b/toolchain/sem_ir/ids.h index 59e12232d303..f6e380b63b84 100644 --- a/toolchain/sem_ir/ids.h +++ b/toolchain/sem_ir/ids.h @@ -185,11 +185,13 @@ struct NameId : public IdBase, public Printable { // Returns the NameId corresponding to a particular IdentifierId. static auto ForIdentifier(IdentifierId id) -> NameId { - // NOLINTNEXTLINE(misc-redundant-expression): Asserting to be sure. - static_assert(NameId::InvalidIndex == IdentifierId::InvalidIndex); - CARBON_CHECK(id.index >= 0 || id.index == InvalidIndex) - << "Unexpected identifier ID"; - return NameId(id.index); + if (id.index >= 0) { + return NameId(id.index); + } else if (!id.is_valid()) { + return NameId::Invalid; + } else { + CARBON_FATAL() << "Unexpected identifier ID " << id; + } } using IdBase::IdBase; @@ -213,7 +215,7 @@ struct NameId : public IdBase, public Printable { } else if (*this == Base) { out << "Base"; } else { - CARBON_CHECK(index >= 0) << "Unknown index"; + CARBON_CHECK(!is_valid() || index >= 0) << "Unknown index " << index; IdBase::Print(out); } } @@ -347,5 +349,8 @@ struct llvm::DenseMapInfo template <> struct llvm::DenseMapInfo : public Carbon::IndexMapInfo {}; +template <> +struct llvm::DenseMapInfo + : public Carbon::IndexMapInfo {}; #endif // CARBON_TOOLCHAIN_SEM_IR_IDS_H_ diff --git a/toolchain/sem_ir/typed_insts.h b/toolchain/sem_ir/typed_insts.h index 6285c0d60140..473fd3cd79c0 100644 --- a/toolchain/sem_ir/typed_insts.h +++ b/toolchain/sem_ir/typed_insts.h @@ -449,6 +449,7 @@ struct Namespace { Parse::NamespaceId parse_node; TypeId type_id; + NameId name_id; NameScopeId name_scope_id; }; diff --git a/toolchain/sem_ir/value_stores.cpp b/toolchain/sem_ir/value_stores.cpp index 4271884b7cb3..7d6e880f9974 100644 --- a/toolchain/sem_ir/value_stores.cpp +++ b/toolchain/sem_ir/value_stores.cpp @@ -47,4 +47,32 @@ auto NameStoreWrapper::GetIRBaseName(NameId name_id) const -> llvm::StringRef { return GetSpecialName(name_id, /*for_ir=*/true); } +auto NameScope::Print(llvm::raw_ostream& out) const -> void { + out << "{inst: " << inst_id << ", enclosing_scope: " << enclosing_scope_id + << ", has_error: " << (has_error ? "true" : "false"); + + out << ", extended_scopes: ["; + llvm::ListSeparator scope_sep; + for (auto id : extended_scopes) { + out << scope_sep << id; + } + out << "]"; + + out << ", names: {"; + // Sort name keys to get stable output. + llvm::SmallVector keys; + for (auto [key, _] : names) { + keys.push_back(key); + } + llvm::sort(keys, + [](NameId lhs, NameId rhs) { return lhs.index < rhs.index; }); + llvm::ListSeparator key_sep; + for (auto key : keys) { + out << key_sep << key << ": " << names.find(key)->second; + } + out << "}"; + + out << "}"; +} + } // namespace Carbon::SemIR diff --git a/toolchain/sem_ir/value_stores.h b/toolchain/sem_ir/value_stores.h index 019e1d145fce..616703893642 100644 --- a/toolchain/sem_ir/value_stores.h +++ b/toolchain/sem_ir/value_stores.h @@ -171,7 +171,9 @@ class NameStoreWrapper { const StringStoreWrapper* identifiers_; }; -struct NameScope { +struct NameScope : Printable { + auto Print(llvm::raw_ostream& out) const -> void; + // Names in the scope. llvm::DenseMap names = llvm::DenseMap(); @@ -193,9 +195,12 @@ struct NameScope { // TODO: Consider using something like `TinyPtrVector` for this. llvm::SmallVector extended_scopes; - // The instructioning which owns the scope. + // The instruction which owns the scope. InstId inst_id; + // The scope enclosing this one. + NameScopeId enclosing_scope_id; + // Whether we have diagnosed an error in a construct that would have added // names to this scope. For example, this can happen if an `import` failed or // an `extend` declaration was ill-formed. If true, the `names` map is @@ -208,8 +213,9 @@ struct NameScope { class NameScopeStore { public: // Adds a name scope, returning an ID to reference it. - auto Add(InstId inst_id) -> NameScopeId { - return values_.Add({.inst_id = inst_id}); + auto Add(InstId inst_id, NameScopeId enclosing_scope_id) -> NameScopeId { + return values_.Add( + {.inst_id = inst_id, .enclosing_scope_id = enclosing_scope_id}); } // Adds an entry to a name scope. Returns true on success, false on @@ -227,6 +233,10 @@ class NameScopeStore { return values_.Get(scope_id); } + auto OutputYaml() const -> Yaml::OutputMapping { + return values_.OutputYaml(); + } + private: ValueStore values_; }; diff --git a/toolchain/sem_ir/yaml_test.cpp b/toolchain/sem_ir/yaml_test.cpp index 18497b553c48..8ec1614b31e3 100644 --- a/toolchain/sem_ir/yaml_test.cpp +++ b/toolchain/sem_ir/yaml_test.cpp @@ -50,6 +50,7 @@ TEST(SemIRTest, YAML) { auto file = Yaml::Mapping(ElementsAre( Pair("cross_ref_irs_size", "1"), + Pair("name_scopes", Yaml::Mapping(SizeIs(1))), Pair("bind_names", Yaml::Mapping(SizeIs(1))), Pair("functions", Yaml::Mapping(SizeIs(1))), Pair("classes", Yaml::Mapping(SizeIs(0))),