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.
61 lines
2.3 KiB
Plaintext
61 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 F() -> bool { return true; }
|
|
fn G() -> bool { return true; }
|
|
|
|
fn Or() -> bool {
|
|
return F() or G();
|
|
}
|
|
|
|
// CHECK:STDOUT: --- or.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %.1: bool = bool_literal true [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.F = %F, .G = %G, .Or = %Or} [template]
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F [template]
|
|
// CHECK:STDOUT: %G: <function> = fn_decl @G [template]
|
|
// CHECK:STDOUT: %Or: <function> = fn_decl @Or [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F() -> bool {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %.loc7: bool = bool_literal true [template = constants.%.1]
|
|
// CHECK:STDOUT: return %.loc7
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @G() -> bool {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %.loc8: bool = bool_literal true [template = constants.%.1]
|
|
// CHECK:STDOUT: return %.loc8
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Or() -> bool {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %F.ref: <function> = name_ref F, file.%F [template = file.%F]
|
|
// CHECK:STDOUT: %.loc11_11.1: init bool = call %F.ref()
|
|
// CHECK:STDOUT: %.loc11_14.1: bool = value_of_initializer %.loc11_11.1
|
|
// CHECK:STDOUT: %.loc11_11.2: bool = converted %.loc11_11.1, %.loc11_14.1
|
|
// CHECK:STDOUT: %.loc11_14.2: bool = not %.loc11_11.2
|
|
// CHECK:STDOUT: %.loc11_14.3: bool = bool_literal true [template = constants.%.1]
|
|
// CHECK:STDOUT: if %.loc11_14.2 br !or.rhs else br !or.result(%.loc11_14.3)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !or.rhs:
|
|
// CHECK:STDOUT: %G.ref: <function> = name_ref G, file.%G [template = file.%G]
|
|
// CHECK:STDOUT: %.loc11_18.1: init bool = call %G.ref()
|
|
// CHECK:STDOUT: %.loc11_14.4: bool = value_of_initializer %.loc11_18.1
|
|
// CHECK:STDOUT: %.loc11_18.2: bool = converted %.loc11_18.1, %.loc11_14.4
|
|
// CHECK:STDOUT: br !or.result(%.loc11_18.2)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !or.result:
|
|
// CHECK:STDOUT: %.loc11_14.5: bool = block_arg !or.result
|
|
// CHECK:STDOUT: return %.loc11_14.5
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|