mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-02 11:55:52 +01:00
Jon Ross-PerkinsandRichard Smith
76ed3c73cb
This removes the builtin FunctionType, replacing it with a FunctionType instruction. The constant for a FunctionDecl is now a StructValue with type of FunctionType. Note this means a function declaration produces _both_ a type, and a value of the type. This has some consequences in terms of circularity, and makes the importing of function declarations a little more complex. It'll get particularly peculiar for imports because of the behavior of the reference, but that's a known issue due to other things such as `alias`. The impact will hopefully be contained to ResolvePrevInstForMerge (and ImportRefs). To note a small formatting change in diagnostics: ``` - // CHECK:STDERR: fail_member_lookup.carbon:[[@LINE+4]]:3: ERROR: Value of type `<associated <function> in Interface>` is not callable. + // CHECK:STDERR: fail_member_lookup.carbon:[[@LINE+4]]:3: ERROR: Value of type `<associated F in Interface>` is not callable. - // CHECK:STDERR: fail_todo_facet_lookup.carbon:[[@LINE+4]]:3: ERROR: Value of type `<associated <function> in Interface>` is not callable. + // CHECK:STDERR: fail_todo_facet_lookup.carbon:[[@LINE+4]]:3: ERROR: Value of type `<associated F in Interface>` is not callable. ``` --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
88 lines
3.2 KiB
Plaintext
88 lines
3.2 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 Cond() -> bool;
|
|
|
|
fn F();
|
|
fn G();
|
|
fn H();
|
|
|
|
fn While() {
|
|
F();
|
|
while (Cond()) {
|
|
G();
|
|
}
|
|
H();
|
|
}
|
|
|
|
// CHECK:STDOUT: --- while.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Cond: type = fn_type @Cond [template]
|
|
// CHECK:STDOUT: %.1: type = tuple_type () [template]
|
|
// CHECK:STDOUT: %struct.1: Cond = struct_value () [template]
|
|
// CHECK:STDOUT: %F: type = fn_type @F [template]
|
|
// CHECK:STDOUT: %struct.2: F = struct_value () [template]
|
|
// CHECK:STDOUT: %G: type = fn_type @G [template]
|
|
// CHECK:STDOUT: %struct.3: G = struct_value () [template]
|
|
// CHECK:STDOUT: %H: type = fn_type @H [template]
|
|
// CHECK:STDOUT: %struct.4: H = struct_value () [template]
|
|
// CHECK:STDOUT: %While: type = fn_type @While [template]
|
|
// CHECK:STDOUT: %struct.5: While = struct_value () [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
|
// CHECK:STDOUT: .Core = %Core
|
|
// CHECK:STDOUT: .Cond = %Cond.decl
|
|
// CHECK:STDOUT: .F = %F.decl
|
|
// CHECK:STDOUT: .G = %G.decl
|
|
// CHECK:STDOUT: .H = %H.decl
|
|
// CHECK:STDOUT: .While = %While.decl
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Core: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: %Cond.decl: Cond = fn_decl @Cond [template = constants.%struct.1] {
|
|
// CHECK:STDOUT: @Cond.%return: ref bool = var <return slot>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %F.decl: F = fn_decl @F [template = constants.%struct.2] {}
|
|
// CHECK:STDOUT: %G.decl: G = fn_decl @G [template = constants.%struct.3] {}
|
|
// CHECK:STDOUT: %H.decl: H = fn_decl @H [template = constants.%struct.4] {}
|
|
// CHECK:STDOUT: %While.decl: While = fn_decl @While [template = constants.%struct.5] {}
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Cond() -> bool;
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @G();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @H();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @While() {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %F.ref: F = name_ref F, file.%F.decl [template = constants.%struct.2]
|
|
// CHECK:STDOUT: %F.call: init () = call %F.ref()
|
|
// CHECK:STDOUT: br !while.cond
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !while.cond:
|
|
// CHECK:STDOUT: %Cond.ref: Cond = name_ref Cond, file.%Cond.decl [template = constants.%struct.1]
|
|
// CHECK:STDOUT: %Cond.call: init bool = call %Cond.ref()
|
|
// CHECK:STDOUT: %.loc15_16.1: bool = value_of_initializer %Cond.call
|
|
// CHECK:STDOUT: %.loc15_16.2: bool = converted %Cond.call, %.loc15_16.1
|
|
// CHECK:STDOUT: if %.loc15_16.2 br !while.body else br !while.done
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !while.body:
|
|
// CHECK:STDOUT: %G.ref: G = name_ref G, file.%G.decl [template = constants.%struct.3]
|
|
// CHECK:STDOUT: %G.call: init () = call %G.ref()
|
|
// CHECK:STDOUT: br !while.cond
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !while.done:
|
|
// CHECK:STDOUT: %H.ref: H = name_ref H, file.%H.decl [template = constants.%struct.4]
|
|
// CHECK:STDOUT: %H.call: init () = call %H.ref()
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|