mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-30 14:45:00 +01:00
Jon Ross-Perkins
91f0c23124
Building on #3636 which handles the general import case, add special casing for namespaces. Namespaces can be combined cross-IR, so it's a little more complex. The implementation adds import_id to the Namespace instruction as a reference to find the original using the normal structure. This is achieved by moving the name_id to NameScope to free up space. --- I considered a few alternatives... I considered adding import_id to NameScope, but: 1. It's more consistent with things such as Function or Class that provide name_id on the info object rather than the instruction. 2. I thought it more likely that there would be more NameScope cases that might want a name_id rather than the import_id, since ImportRef will typically be used. I considered putting the import source (cross-ref IR id + inst id) on the NameScope versus a separate ImportRef, which seems like the strongest argument towards the NameScope approach because it removes an instruction. That just felt inconsistent though, and the overhead of instruction-per-imported-namespace should be low (theoretically few namespaces should be used). Plus I feel a bit odd adding two generally-unused ids to NameScope. A specialized Namespace structure could also have been created to store the import_id, but that would add an indirection to the NameScope.
144 lines
4.6 KiB
Plaintext
144 lines
4.6 KiB
Plaintext
// 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
|
|
|
|
// --- global.carbon
|
|
|
|
package Global api;
|
|
|
|
var x: i32 = 0;
|
|
|
|
fn Main() {
|
|
var x: i32 = 1;
|
|
|
|
var y: i32 = package.x;
|
|
}
|
|
|
|
// --- inside_fn.carbon
|
|
|
|
package InsideFn api;
|
|
|
|
var x: i32 = 0;
|
|
|
|
fn Main() {
|
|
var x: i32 = 1;
|
|
|
|
var y: i32 = package.x;
|
|
}
|
|
|
|
// --- namespace.carbon
|
|
|
|
package Namespace api;
|
|
|
|
namespace NS;
|
|
|
|
class NS.C {
|
|
fn Foo() {}
|
|
};
|
|
|
|
fn Main() {
|
|
package.NS.C.Foo();
|
|
}
|
|
|
|
// CHECK:STDOUT: --- global.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %.1: i32 = int_literal 0 [template]
|
|
// CHECK:STDOUT: %.2: i32 = int_literal 1 [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.x = %x, .Main = %Main} [template]
|
|
// 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 [template = constants.%.1]
|
|
// CHECK:STDOUT: assign %x.var, %.loc4
|
|
// CHECK:STDOUT: %Main: <function> = fn_decl @Main [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Main() {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %x.var: ref i32 = var x
|
|
// CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var
|
|
// CHECK:STDOUT: %.loc7: i32 = int_literal 1 [template = constants.%.2]
|
|
// CHECK:STDOUT: assign %x.var, %.loc7
|
|
// CHECK:STDOUT: %y.var: ref i32 = var y
|
|
// CHECK:STDOUT: %y: ref i32 = bind_name y, %y.var
|
|
// CHECK:STDOUT: %package.ref: <namespace> = name_ref package, package [template = package]
|
|
// CHECK:STDOUT: %x.ref: ref i32 = name_ref x, file.%x
|
|
// CHECK:STDOUT: %.loc9: i32 = bind_value %x.ref
|
|
// CHECK:STDOUT: assign %y.var, %.loc9
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- inside_fn.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %.1: i32 = int_literal 0 [template]
|
|
// CHECK:STDOUT: %.2: i32 = int_literal 1 [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.x = %x, .Main = %Main} [template]
|
|
// 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 [template = constants.%.1]
|
|
// CHECK:STDOUT: assign %x.var, %.loc4
|
|
// CHECK:STDOUT: %Main: <function> = fn_decl @Main [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Main() {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %x.var: ref i32 = var x
|
|
// CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var
|
|
// CHECK:STDOUT: %.loc7: i32 = int_literal 1 [template = constants.%.2]
|
|
// CHECK:STDOUT: assign %x.var, %.loc7
|
|
// CHECK:STDOUT: %y.var: ref i32 = var y
|
|
// CHECK:STDOUT: %y: ref i32 = bind_name y, %y.var
|
|
// CHECK:STDOUT: %package.ref: <namespace> = name_ref package, package [template = package]
|
|
// CHECK:STDOUT: %x.ref: ref i32 = name_ref x, file.%x
|
|
// CHECK:STDOUT: %.loc9: i32 = bind_value %x.ref
|
|
// CHECK:STDOUT: assign %y.var, %.loc9
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: --- namespace.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %C: type = class_type @C [template]
|
|
// CHECK:STDOUT: %.1: type = struct_type {} [template]
|
|
// CHECK:STDOUT: %.2: type = tuple_type () [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.NS = %.loc4, .Main = %Main} [template]
|
|
// CHECK:STDOUT: %.loc4: <namespace> = namespace {.C = %C.decl} [template]
|
|
// CHECK:STDOUT: %C.decl = class_decl @C, ()
|
|
// CHECK:STDOUT: %Main: <function> = fn_decl @Main [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @C {
|
|
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Foo = %Foo
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Foo() {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Main() {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %package.ref: <namespace> = name_ref package, package [template = package]
|
|
// CHECK:STDOUT: %NS.ref: <namespace> = name_ref NS, file.%.loc4 [template = file.%.loc4]
|
|
// CHECK:STDOUT: %C.ref: type = name_ref C, constants.%C [template = constants.%C]
|
|
// CHECK:STDOUT: %Foo.ref: <function> = name_ref Foo, @C.%Foo [template = @C.%Foo]
|
|
// CHECK:STDOUT: %.loc11: init () = call %Foo.ref()
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|