mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-02 22:02:51 +01: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.
113 lines
5.7 KiB
Plaintext
113 lines
5.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
|
|
|
|
base class Base {
|
|
var b: i32;
|
|
}
|
|
|
|
class Derived {
|
|
extend base: Base;
|
|
|
|
var d: i32;
|
|
}
|
|
|
|
fn Make() -> Derived {
|
|
return {.base = {.b = 4}, .d = 7};
|
|
}
|
|
|
|
fn Access(d: Derived) -> (i32, i32) {
|
|
return (d.d, d.base.b);
|
|
}
|
|
|
|
// CHECK:STDOUT: --- base.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Base: type = class_type @Base [template]
|
|
// CHECK:STDOUT: %.1: type = unbound_element_type Base, i32 [template]
|
|
// CHECK:STDOUT: %.2: type = struct_type {.b: i32} [template]
|
|
// CHECK:STDOUT: %Derived: type = class_type @Derived [template]
|
|
// CHECK:STDOUT: %.3: type = ptr_type {.b: i32} [template]
|
|
// CHECK:STDOUT: %.4: type = unbound_element_type Derived, Base [template]
|
|
// CHECK:STDOUT: %.5: type = unbound_element_type Derived, i32 [template]
|
|
// CHECK:STDOUT: %.6: type = struct_type {.base: Base, .d: i32} [template]
|
|
// CHECK:STDOUT: %.7: type = struct_type {.base: {.b: i32}*, .d: i32} [template]
|
|
// CHECK:STDOUT: %.8: type = ptr_type {.base: {.b: i32}*, .d: i32} [template]
|
|
// CHECK:STDOUT: %.9: type = ptr_type {.base: Base, .d: i32} [template]
|
|
// CHECK:STDOUT: %.10: i32 = int_literal 4 [template]
|
|
// CHECK:STDOUT: %.11: i32 = int_literal 7 [template]
|
|
// CHECK:STDOUT: %.12: type = struct_type {.base: {.b: i32}, .d: i32} [template]
|
|
// CHECK:STDOUT: %.13: Base = struct_value (%.10) [template]
|
|
// CHECK:STDOUT: %.14: Derived = struct_value (%.13, %.11) [template]
|
|
// CHECK:STDOUT: %.15: type = tuple_type (type, type) [template]
|
|
// CHECK:STDOUT: %.16: type = tuple_type (i32, i32) [template]
|
|
// CHECK:STDOUT: %.17: type = ptr_type (i32, i32) [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} [template]
|
|
// CHECK:STDOUT: %Base.decl = class_decl @Base, ()
|
|
// CHECK:STDOUT: %Derived.decl = class_decl @Derived, ()
|
|
// CHECK:STDOUT: %Make: <function> = fn_decl @Make [template]
|
|
// CHECK:STDOUT: %Access: <function> = fn_decl @Access [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Base {
|
|
// CHECK:STDOUT: %.loc8: <unbound element of class Base> = field_decl b, element0 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .b = %.loc8
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Derived {
|
|
// CHECK:STDOUT: %Base.ref: type = name_ref Base, constants.%Base [template = constants.%Base]
|
|
// CHECK:STDOUT: %.loc12: <unbound element of class Derived> = base_decl Base, element0 [template]
|
|
// CHECK:STDOUT: %.loc14: <unbound element of class Derived> = field_decl d, element1 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .base = %.loc12
|
|
// CHECK:STDOUT: .d = %.loc14
|
|
// CHECK:STDOUT: extend name_scope1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Make() -> %return: Derived {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %.loc18_25: i32 = int_literal 4 [template = constants.%.10]
|
|
// CHECK:STDOUT: %.loc18_26.1: {.b: i32} = struct_literal (%.loc18_25)
|
|
// CHECK:STDOUT: %.loc18_34: i32 = int_literal 7 [template = constants.%.11]
|
|
// CHECK:STDOUT: %.loc18_35.1: {.base: {.b: i32}, .d: i32} = struct_literal (%.loc18_26.1, %.loc18_34)
|
|
// CHECK:STDOUT: %.loc18_35.2: ref Base = class_element_access %return, element0
|
|
// CHECK:STDOUT: %.loc18_26.2: ref i32 = class_element_access %.loc18_35.2, element0
|
|
// CHECK:STDOUT: %.loc18_26.3: init i32 = initialize_from %.loc18_25 to %.loc18_26.2 [template = constants.%.10]
|
|
// CHECK:STDOUT: %.loc18_26.4: init Base = class_init (%.loc18_26.3), %.loc18_35.2 [template = constants.%.13]
|
|
// CHECK:STDOUT: %.loc18_26.5: init Base = converted %.loc18_26.1, %.loc18_26.4 [template = constants.%.13]
|
|
// CHECK:STDOUT: %.loc18_35.3: ref i32 = class_element_access %return, element1
|
|
// CHECK:STDOUT: %.loc18_35.4: init i32 = initialize_from %.loc18_34 to %.loc18_35.3 [template = constants.%.11]
|
|
// CHECK:STDOUT: %.loc18_35.5: init Derived = class_init (%.loc18_26.5, %.loc18_35.4), %return [template = constants.%.14]
|
|
// CHECK:STDOUT: %.loc18_35.6: init Derived = converted %.loc18_35.1, %.loc18_35.5 [template = constants.%.14]
|
|
// CHECK:STDOUT: return %.loc18_35.6
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Access(%d: Derived) -> %return: (i32, i32) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %d.ref.loc22_11: Derived = name_ref d, %d
|
|
// CHECK:STDOUT: %.loc22_12.1: ref i32 = class_element_access %d.ref.loc22_11, element1
|
|
// CHECK:STDOUT: %.loc22_12.2: i32 = bind_value %.loc22_12.1
|
|
// CHECK:STDOUT: %d.ref.loc22_16: Derived = name_ref d, %d
|
|
// CHECK:STDOUT: %.loc22_17.1: ref Base = class_element_access %d.ref.loc22_16, element0
|
|
// CHECK:STDOUT: %.loc22_17.2: Base = bind_value %.loc22_17.1
|
|
// CHECK:STDOUT: %.loc22_22.1: ref i32 = class_element_access %.loc22_17.2, element0
|
|
// CHECK:STDOUT: %.loc22_22.2: i32 = bind_value %.loc22_22.1
|
|
// CHECK:STDOUT: %.loc22_24.1: (i32, i32) = tuple_literal (%.loc22_12.2, %.loc22_22.2)
|
|
// CHECK:STDOUT: %.loc22_24.2: ref i32 = tuple_access %return, element0
|
|
// CHECK:STDOUT: %.loc22_24.3: init i32 = initialize_from %.loc22_12.2 to %.loc22_24.2
|
|
// CHECK:STDOUT: %.loc22_24.4: ref i32 = tuple_access %return, element1
|
|
// CHECK:STDOUT: %.loc22_24.5: init i32 = initialize_from %.loc22_22.2 to %.loc22_24.4
|
|
// CHECK:STDOUT: %.loc22_24.6: init (i32, i32) = tuple_init (%.loc22_24.3, %.loc22_24.5) to %return
|
|
// CHECK:STDOUT: %.loc22_24.7: init (i32, i32) = converted %.loc22_24.1, %.loc22_24.6
|
|
// CHECK:STDOUT: return %.loc22_24.7
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|