mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-30 17:24:59 +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.
64 lines
2.4 KiB
Plaintext
64 lines
2.4 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() -> i32 { return 1; }
|
|
fn B() -> i32 { return 2; }
|
|
|
|
fn F(b: bool) -> i32 {
|
|
return if b then A() else B();
|
|
}
|
|
|
|
// CHECK:STDOUT: --- control_flow.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %.1: i32 = int_literal 1 [template]
|
|
// CHECK:STDOUT: %.2: i32 = int_literal 2 [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.A = %A, .B = %B, .F = %F} [template]
|
|
// CHECK:STDOUT: %A: <function> = fn_decl @A [template]
|
|
// CHECK:STDOUT: %B: <function> = fn_decl @B [template]
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @A() -> i32 {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %.loc7: i32 = int_literal 1 [template = constants.%.1]
|
|
// CHECK:STDOUT: return %.loc7
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @B() -> i32 {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %.loc8: i32 = int_literal 2 [template = constants.%.2]
|
|
// CHECK:STDOUT: return %.loc8
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F(%b: bool) -> i32 {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %b.ref: bool = name_ref b, %b
|
|
// CHECK:STDOUT: if %b.ref br !if.expr.then else br !if.expr.else
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.then:
|
|
// CHECK:STDOUT: %A.ref: <function> = name_ref A, file.%A [template = file.%A]
|
|
// CHECK:STDOUT: %.loc11_21.1: init i32 = call %A.ref()
|
|
// CHECK:STDOUT: %.loc11_21.2: i32 = value_of_initializer %.loc11_21.1
|
|
// CHECK:STDOUT: %.loc11_21.3: i32 = converted %.loc11_21.1, %.loc11_21.2
|
|
// CHECK:STDOUT: br !if.expr.result(%.loc11_21.3)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.else:
|
|
// CHECK:STDOUT: %B.ref: <function> = name_ref B, file.%B [template = file.%B]
|
|
// CHECK:STDOUT: %.loc11_30.1: init i32 = call %B.ref()
|
|
// CHECK:STDOUT: %.loc11_24: i32 = value_of_initializer %.loc11_30.1
|
|
// CHECK:STDOUT: %.loc11_30.2: i32 = converted %.loc11_30.1, %.loc11_24
|
|
// CHECK:STDOUT: br !if.expr.result(%.loc11_30.2)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.result:
|
|
// CHECK:STDOUT: %.loc11_10: i32 = block_arg !if.expr.result
|
|
// CHECK:STDOUT: return %.loc11_10
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|