mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-01 22:02:45 +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.
78 lines
3.7 KiB
Plaintext
78 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
|
|
|
|
class Class {
|
|
var n: i32;
|
|
var next: Class*;
|
|
}
|
|
|
|
fn Make(n: i32, next: Class*) -> Class {
|
|
return {.n = n, .next = next};
|
|
}
|
|
|
|
fn MakeReorder(n: i32, next: Class*) -> Class {
|
|
return {.next = next, .n = n};
|
|
}
|
|
|
|
// CHECK:STDOUT: --- init.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Class: type = class_type @Class [template]
|
|
// CHECK:STDOUT: %.1: type = unbound_element_type Class, i32 [template]
|
|
// CHECK:STDOUT: %.2: type = ptr_type Class [template]
|
|
// CHECK:STDOUT: %.3: type = unbound_element_type Class, Class* [template]
|
|
// CHECK:STDOUT: %.4: type = struct_type {.n: i32, .next: Class*} [template]
|
|
// CHECK:STDOUT: %.5: type = ptr_type {.n: i32, .next: Class*} [template]
|
|
// CHECK:STDOUT: %.6: type = struct_type {.next: Class*, .n: i32} [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.Class = %Class.decl, .Make = %Make, .MakeReorder = %MakeReorder} [template]
|
|
// CHECK:STDOUT: %Class.decl = class_decl @Class, ()
|
|
// CHECK:STDOUT: %Make: <function> = fn_decl @Make [template]
|
|
// CHECK:STDOUT: %MakeReorder: <function> = fn_decl @MakeReorder [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Class {
|
|
// CHECK:STDOUT: %.loc8: <unbound element of class Class> = field_decl n, element0 [template]
|
|
// CHECK:STDOUT: %Class.ref: type = name_ref Class, constants.%Class [template = constants.%Class]
|
|
// CHECK:STDOUT: %.loc9_18: type = ptr_type Class [template = constants.%.2]
|
|
// CHECK:STDOUT: %.loc9_11: <unbound element of class Class> = field_decl next, element1 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .n = %.loc8
|
|
// CHECK:STDOUT: .next = %.loc9_11
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Make(%n: i32, %next: Class*) -> %return: Class {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n
|
|
// CHECK:STDOUT: %next.ref: Class* = name_ref next, %next
|
|
// CHECK:STDOUT: %.loc13_31.1: {.n: i32, .next: Class*} = struct_literal (%n.ref, %next.ref)
|
|
// CHECK:STDOUT: %.loc13_31.2: ref i32 = class_element_access %return, element0
|
|
// CHECK:STDOUT: %.loc13_31.3: init i32 = initialize_from %n.ref to %.loc13_31.2
|
|
// CHECK:STDOUT: %.loc13_31.4: ref Class* = class_element_access %return, element1
|
|
// CHECK:STDOUT: %.loc13_31.5: init Class* = initialize_from %next.ref to %.loc13_31.4
|
|
// CHECK:STDOUT: %.loc13_31.6: init Class = class_init (%.loc13_31.3, %.loc13_31.5), %return
|
|
// CHECK:STDOUT: %.loc13_31.7: init Class = converted %.loc13_31.1, %.loc13_31.6
|
|
// CHECK:STDOUT: return %.loc13_31.7
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @MakeReorder(%n: i32, %next: Class*) -> %return: Class {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %next.ref: Class* = name_ref next, %next
|
|
// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n
|
|
// CHECK:STDOUT: %.loc17_31.1: {.next: Class*, .n: i32} = struct_literal (%next.ref, %n.ref)
|
|
// CHECK:STDOUT: %.loc17_31.2: ref i32 = class_element_access %return, element1
|
|
// CHECK:STDOUT: %.loc17_31.3: init i32 = initialize_from %n.ref to %.loc17_31.2
|
|
// CHECK:STDOUT: %.loc17_31.4: ref Class* = class_element_access %return, element0
|
|
// CHECK:STDOUT: %.loc17_31.5: init Class* = initialize_from %next.ref to %.loc17_31.4
|
|
// CHECK:STDOUT: %.loc17_31.6: init Class = class_init (%.loc17_31.3, %.loc17_31.5), %return
|
|
// CHECK:STDOUT: %.loc17_31.7: init Class = converted %.loc17_31.1, %.loc17_31.6
|
|
// CHECK:STDOUT: return %.loc17_31.7
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|