mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Richard Smith
5f4e6c768a
Previously we used the default inst block formatting, which writes out a parenthesized list of references, which would always be 'unexpected instref's because nothing else prints the instructions in the decl block. In addition, track the decl block for function declarations like we do for other kinds of declaration. This means that the parameter declarations for a function are now properly rendered into the formatted IR. Note that this adds a lot of verbosity to `function_decl`, but it does accurately reflect the IR, and we'll probably want this information to be printed once we start supporting more complex generic function declarations. This removes almost all the 'unexpected instref's in our formatted output. There are remaining cases when a declarative scope contains multiple blocks, where we only track one of those blocks. That happens when there is control flow within declarative scopes, and for error recovery when a class or interface or similar is defined more than once. As requested in #3730.
148 lines
7.6 KiB
Plaintext
148 lines
7.6 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 Outer {
|
|
class Inner {
|
|
var pi: Self*;
|
|
var po: Outer*;
|
|
var qi: Inner*;
|
|
}
|
|
|
|
var po: Self*;
|
|
var qo: Outer*;
|
|
var pi: Inner*;
|
|
}
|
|
|
|
fn F(a: Outer*) {
|
|
// TODO: Simplify this once `Outer.Inner` works.
|
|
// let b: Outer.Inner* = (*a).pi;
|
|
|
|
(*a).po = a;
|
|
(*a).qo = a;
|
|
(*a).pi = (*a).pi;
|
|
(*(*a).pi).po = a;
|
|
(*(*a).pi).pi = (*a).pi;
|
|
(*(*a).pi).qi = (*a).pi;
|
|
}
|
|
|
|
// CHECK:STDOUT: --- nested.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Outer: type = class_type @Outer [template]
|
|
// CHECK:STDOUT: %Inner: type = class_type @Inner [template]
|
|
// CHECK:STDOUT: %.1: type = ptr_type Inner [template]
|
|
// CHECK:STDOUT: %.2: type = unbound_element_type Inner, Inner* [template]
|
|
// CHECK:STDOUT: %.3: type = ptr_type Outer [template]
|
|
// CHECK:STDOUT: %.4: type = unbound_element_type Inner, Outer* [template]
|
|
// CHECK:STDOUT: %.5: type = struct_type {.pi: Inner*, .po: Outer*, .qi: Inner*} [template]
|
|
// CHECK:STDOUT: %.6: type = unbound_element_type Outer, Outer* [template]
|
|
// CHECK:STDOUT: %.7: type = unbound_element_type Outer, Inner* [template]
|
|
// CHECK:STDOUT: %.8: type = struct_type {.po: Outer*, .qo: Outer*, .pi: Inner*} [template]
|
|
// CHECK:STDOUT: %.9: type = ptr_type {.po: Outer*, .qo: Outer*, .pi: Inner*} [template]
|
|
// CHECK:STDOUT: %.10: type = ptr_type {.pi: Inner*, .po: Outer*, .qi: Inner*} [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.Outer = %Outer.decl, .F = %F} [template]
|
|
// CHECK:STDOUT: %Outer.decl = class_decl @Outer {} [template = constants.%Outer]
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F {
|
|
// CHECK:STDOUT: %Outer.ref: type = name_ref Outer, %Outer.decl [template = constants.%Outer]
|
|
// CHECK:STDOUT: %.loc19: type = ptr_type Outer [template = constants.%.3]
|
|
// CHECK:STDOUT: %a.loc19_6.1: Outer* = param a
|
|
// CHECK:STDOUT: @F.%a: Outer* = bind_name a, %a.loc19_6.1
|
|
// CHECK:STDOUT: } [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Outer {
|
|
// CHECK:STDOUT: %Inner.decl = class_decl @Inner {} [template = constants.%Inner]
|
|
// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Outer [template = constants.%Outer]
|
|
// CHECK:STDOUT: %.loc14_15: type = ptr_type Outer [template = constants.%.3]
|
|
// CHECK:STDOUT: %.loc14_9: <unbound element of class Outer> = field_decl po, element0 [template]
|
|
// CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [template = constants.%Outer]
|
|
// CHECK:STDOUT: %.loc15_16: type = ptr_type Outer [template = constants.%.3]
|
|
// CHECK:STDOUT: %.loc15_9: <unbound element of class Outer> = field_decl qo, element1 [template]
|
|
// CHECK:STDOUT: %Inner.ref: type = name_ref Inner, %Inner.decl [template = constants.%Inner]
|
|
// CHECK:STDOUT: %.loc16_16: type = ptr_type Inner [template = constants.%.1]
|
|
// CHECK:STDOUT: %.loc16_9: <unbound element of class Outer> = field_decl pi, element2 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Inner = %Inner.decl
|
|
// CHECK:STDOUT: .po = %.loc14_9
|
|
// CHECK:STDOUT: .qo = %.loc15_9
|
|
// CHECK:STDOUT: .pi = %.loc16_9
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Inner {
|
|
// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Inner [template = constants.%Inner]
|
|
// CHECK:STDOUT: %.loc9_17: type = ptr_type Inner [template = constants.%.1]
|
|
// CHECK:STDOUT: %.loc9_11: <unbound element of class Inner> = field_decl pi, element0 [template]
|
|
// CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [template = constants.%Outer]
|
|
// CHECK:STDOUT: %.loc10_18: type = ptr_type Outer [template = constants.%.3]
|
|
// CHECK:STDOUT: %.loc10_11: <unbound element of class Inner> = field_decl po, element1 [template]
|
|
// CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [template = constants.%Inner]
|
|
// CHECK:STDOUT: %.loc11_18: type = ptr_type Inner [template = constants.%.1]
|
|
// CHECK:STDOUT: %.loc11_11: <unbound element of class Inner> = field_decl qi, element2 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .pi = %.loc9_11
|
|
// CHECK:STDOUT: .po = %.loc10_11
|
|
// CHECK:STDOUT: .qi = %.loc11_11
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F(%a: Outer*) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %a.ref.loc23_5: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: %.loc23_4: ref Outer = deref %a.ref.loc23_5
|
|
// CHECK:STDOUT: %.loc23_7: ref Outer* = class_element_access %.loc23_4, element0
|
|
// CHECK:STDOUT: %a.ref.loc23_13: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: assign %.loc23_7, %a.ref.loc23_13
|
|
// CHECK:STDOUT: %a.ref.loc24_5: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: %.loc24_4: ref Outer = deref %a.ref.loc24_5
|
|
// CHECK:STDOUT: %.loc24_7: ref Outer* = class_element_access %.loc24_4, element1
|
|
// CHECK:STDOUT: %a.ref.loc24_13: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: assign %.loc24_7, %a.ref.loc24_13
|
|
// CHECK:STDOUT: %a.ref.loc25_5: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: %.loc25_4: ref Outer = deref %a.ref.loc25_5
|
|
// CHECK:STDOUT: %.loc25_7: ref Inner* = class_element_access %.loc25_4, element2
|
|
// CHECK:STDOUT: %a.ref.loc25_15: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: %.loc25_14: ref Outer = deref %a.ref.loc25_15
|
|
// CHECK:STDOUT: %.loc25_17.1: ref Inner* = class_element_access %.loc25_14, element2
|
|
// CHECK:STDOUT: %.loc25_17.2: Inner* = bind_value %.loc25_17.1
|
|
// CHECK:STDOUT: assign %.loc25_7, %.loc25_17.2
|
|
// CHECK:STDOUT: %a.ref.loc26_7: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: %.loc26_6: ref Outer = deref %a.ref.loc26_7
|
|
// CHECK:STDOUT: %.loc26_9.1: ref Inner* = class_element_access %.loc26_6, element2
|
|
// CHECK:STDOUT: %.loc26_9.2: Inner* = bind_value %.loc26_9.1
|
|
// CHECK:STDOUT: %.loc26_4: ref Inner = deref %.loc26_9.2
|
|
// CHECK:STDOUT: %.loc26_13: ref Outer* = class_element_access %.loc26_4, element1
|
|
// CHECK:STDOUT: %a.ref.loc26_19: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: assign %.loc26_13, %a.ref.loc26_19
|
|
// CHECK:STDOUT: %a.ref.loc27_7: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: %.loc27_6: ref Outer = deref %a.ref.loc27_7
|
|
// CHECK:STDOUT: %.loc27_9.1: ref Inner* = class_element_access %.loc27_6, element2
|
|
// CHECK:STDOUT: %.loc27_9.2: Inner* = bind_value %.loc27_9.1
|
|
// CHECK:STDOUT: %.loc27_4: ref Inner = deref %.loc27_9.2
|
|
// CHECK:STDOUT: %.loc27_13: ref Inner* = class_element_access %.loc27_4, element0
|
|
// CHECK:STDOUT: %a.ref.loc27_21: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: %.loc27_20: ref Outer = deref %a.ref.loc27_21
|
|
// CHECK:STDOUT: %.loc27_23.1: ref Inner* = class_element_access %.loc27_20, element2
|
|
// CHECK:STDOUT: %.loc27_23.2: Inner* = bind_value %.loc27_23.1
|
|
// CHECK:STDOUT: assign %.loc27_13, %.loc27_23.2
|
|
// CHECK:STDOUT: %a.ref.loc28_7: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: %.loc28_6: ref Outer = deref %a.ref.loc28_7
|
|
// CHECK:STDOUT: %.loc28_9.1: ref Inner* = class_element_access %.loc28_6, element2
|
|
// CHECK:STDOUT: %.loc28_9.2: Inner* = bind_value %.loc28_9.1
|
|
// CHECK:STDOUT: %.loc28_4: ref Inner = deref %.loc28_9.2
|
|
// CHECK:STDOUT: %.loc28_13: ref Inner* = class_element_access %.loc28_4, element2
|
|
// CHECK:STDOUT: %a.ref.loc28_21: Outer* = name_ref a, %a
|
|
// CHECK:STDOUT: %.loc28_20: ref Outer = deref %a.ref.loc28_21
|
|
// CHECK:STDOUT: %.loc28_23.1: ref Inner* = class_element_access %.loc28_20, element2
|
|
// CHECK:STDOUT: %.loc28_23.2: Inner* = bind_value %.loc28_23.1
|
|
// CHECK:STDOUT: assign %.loc28_13, %.loc28_23.2
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|