mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-22 02:56:41 +00:00
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.
68 lines
2.3 KiB
Plaintext
68 lines
2.3 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
|
|
|
|
fn A();
|
|
|
|
namespace N;
|
|
fn N.A();
|
|
|
|
namespace N.M;
|
|
|
|
fn N.M.B() -> i32 {
|
|
// This is N.A, not package.A.
|
|
A();
|
|
if (true) {
|
|
var A: i32 = 0;
|
|
// This is the local A.
|
|
// TODO: Decide if we should warn or error on the shadowing of N.A here.
|
|
return A;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
// CHECK:STDOUT: --- shadow.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %.1: type = tuple_type () [template]
|
|
// CHECK:STDOUT: %.2: bool = bool_literal true [template]
|
|
// CHECK:STDOUT: %.3: i32 = int_literal 0 [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.A = %A.loc7, .N = %.loc9} [template]
|
|
// CHECK:STDOUT: %A.loc7: <function> = fn_decl @A.1 [template]
|
|
// CHECK:STDOUT: %.loc9: <namespace> = namespace {.A = %A.loc10, .M = %.loc12} [template]
|
|
// CHECK:STDOUT: %A.loc10: <function> = fn_decl @A.2 [template]
|
|
// CHECK:STDOUT: %.loc12: <namespace> = namespace {.B = %B} [template]
|
|
// CHECK:STDOUT: %B: <function> = fn_decl @B [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @A.1();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @A.2();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @B() -> i32 {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %A.ref.loc16: <function> = name_ref A, file.%A.loc10 [template = file.%A.loc10]
|
|
// CHECK:STDOUT: %.loc16: init () = call %A.ref.loc16()
|
|
// CHECK:STDOUT: %.loc17: bool = bool_literal true [template = constants.%.2]
|
|
// CHECK:STDOUT: if %.loc17 br !if.then else br !if.else
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.then:
|
|
// CHECK:STDOUT: %A.var: ref i32 = var A
|
|
// CHECK:STDOUT: %A: ref i32 = bind_name A, %A.var
|
|
// CHECK:STDOUT: %.loc18: i32 = int_literal 0 [template = constants.%.3]
|
|
// CHECK:STDOUT: assign %A.var, %.loc18
|
|
// CHECK:STDOUT: %A.ref.loc21: ref i32 = name_ref A, %A
|
|
// CHECK:STDOUT: %.loc21: i32 = bind_value %A.ref.loc21
|
|
// CHECK:STDOUT: return %.loc21
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.else:
|
|
// CHECK:STDOUT: %.loc23: i32 = int_literal 0 [template = constants.%.3]
|
|
// CHECK:STDOUT: return %.loc23
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|