mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-01 13:25:52 +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.
70 lines
3.7 KiB
Plaintext
70 lines
3.7 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 MakeI32() -> i32;
|
|
fn MakeF64() -> f64;
|
|
|
|
fn F() -> {.a: i32, .b: f64} {
|
|
let x: {.a: i32, .b: f64} = {.b = MakeF64(), .a = MakeI32()};
|
|
let y: {.b: f64, .a: i32} = x;
|
|
return y;
|
|
}
|
|
|
|
// CHECK:STDOUT: --- reorder_fields.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %.1: type = struct_type {.a: i32, .b: f64} [template]
|
|
// CHECK:STDOUT: %.2: type = ptr_type {.a: i32, .b: f64} [template]
|
|
// CHECK:STDOUT: %.3: type = struct_type {.b: f64, .a: i32} [template]
|
|
// CHECK:STDOUT: %.4: type = ptr_type {.b: f64, .a: i32} [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.MakeI32 = %MakeI32, .MakeF64 = %MakeF64, .F = %F} [template]
|
|
// CHECK:STDOUT: %MakeI32: <function> = fn_decl @MakeI32 [template]
|
|
// CHECK:STDOUT: %MakeF64: <function> = fn_decl @MakeF64 [template]
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @MakeI32() -> i32;
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @MakeF64() -> f64;
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F() -> %return: {.a: i32, .b: f64} {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %.loc11_27: type = struct_type {.a: i32, .b: f64} [template = constants.%.1]
|
|
// CHECK:STDOUT: %MakeF64.ref: <function> = name_ref MakeF64, file.%MakeF64 [template = file.%MakeF64]
|
|
// CHECK:STDOUT: %.loc11_44.1: init f64 = call %MakeF64.ref()
|
|
// CHECK:STDOUT: %MakeI32.ref: <function> = name_ref MakeI32, file.%MakeI32 [template = file.%MakeI32]
|
|
// CHECK:STDOUT: %.loc11_60.1: init i32 = call %MakeI32.ref()
|
|
// CHECK:STDOUT: %.loc11_62.1: {.b: f64, .a: i32} = struct_literal (%.loc11_44.1, %.loc11_60.1)
|
|
// CHECK:STDOUT: %.loc11_62.2: i32 = value_of_initializer %.loc11_60.1
|
|
// CHECK:STDOUT: %.loc11_60.2: i32 = converted %.loc11_60.1, %.loc11_62.2
|
|
// CHECK:STDOUT: %.loc11_62.3: f64 = value_of_initializer %.loc11_44.1
|
|
// CHECK:STDOUT: %.loc11_44.2: f64 = converted %.loc11_44.1, %.loc11_62.3
|
|
// CHECK:STDOUT: %.loc11_62.4: {.a: i32, .b: f64} = struct_value (%.loc11_60.2, %.loc11_44.2)
|
|
// CHECK:STDOUT: %.loc11_62.5: {.a: i32, .b: f64} = converted %.loc11_62.1, %.loc11_62.4
|
|
// CHECK:STDOUT: %x: {.a: i32, .b: f64} = bind_name x, %.loc11_62.5
|
|
// CHECK:STDOUT: %.loc12_27: type = struct_type {.b: f64, .a: i32} [template = constants.%.3]
|
|
// CHECK:STDOUT: %x.ref: {.a: i32, .b: f64} = name_ref x, %x
|
|
// CHECK:STDOUT: %.loc12_31.1: f64 = struct_access %x.ref, element1
|
|
// CHECK:STDOUT: %.loc12_31.2: i32 = struct_access %x.ref, element0
|
|
// CHECK:STDOUT: %.loc12_31.3: {.b: f64, .a: i32} = struct_value (%.loc12_31.1, %.loc12_31.2)
|
|
// CHECK:STDOUT: %.loc12_31.4: {.b: f64, .a: i32} = converted %x.ref, %.loc12_31.3
|
|
// CHECK:STDOUT: %y: {.b: f64, .a: i32} = bind_name y, %.loc12_31.4
|
|
// CHECK:STDOUT: %y.ref: {.b: f64, .a: i32} = name_ref y, %y
|
|
// CHECK:STDOUT: %.loc13_10.1: i32 = struct_access %y.ref, element1
|
|
// CHECK:STDOUT: %.loc13_10.2: ref i32 = struct_access %return, element1
|
|
// CHECK:STDOUT: %.loc13_10.3: init i32 = initialize_from %.loc13_10.1 to %.loc13_10.2
|
|
// CHECK:STDOUT: %.loc13_10.4: f64 = struct_access %y.ref, element0
|
|
// CHECK:STDOUT: %.loc13_10.5: ref f64 = struct_access %return, element0
|
|
// CHECK:STDOUT: %.loc13_10.6: init f64 = initialize_from %.loc13_10.4 to %.loc13_10.5
|
|
// CHECK:STDOUT: %.loc13_10.7: init {.a: i32, .b: f64} = struct_init (%.loc13_10.3, %.loc13_10.6) to %return
|
|
// CHECK:STDOUT: %.loc13_10.8: init {.a: i32, .b: f64} = converted %y.ref, %.loc13_10.7
|
|
// CHECK:STDOUT: return %.loc13_10.8
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|