mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 22:02: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>
82 lines
3.4 KiB
Plaintext
82 lines
3.4 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 F(a: bool, b: bool, c: bool) -> i32 {
|
|
return if a then if b then 1 else 2 else if c then 3 else 4;
|
|
}
|
|
|
|
// CHECK:STDOUT: --- nested.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %F: type = fn_type @F [template]
|
|
// CHECK:STDOUT: %.1: type = tuple_type () [template]
|
|
// CHECK:STDOUT: %struct: F = struct_value () [template]
|
|
// CHECK:STDOUT: %.2: i32 = int_literal 1 [template]
|
|
// CHECK:STDOUT: %.3: i32 = int_literal 2 [template]
|
|
// CHECK:STDOUT: %.4: i32 = int_literal 3 [template]
|
|
// CHECK:STDOUT: %.5: i32 = int_literal 4 [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
|
// CHECK:STDOUT: .Core = %Core
|
|
// CHECK:STDOUT: .F = %F.decl
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Core: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: %F.decl: F = fn_decl @F [template = constants.%struct] {
|
|
// CHECK:STDOUT: %a.loc7_6.1: bool = param a
|
|
// CHECK:STDOUT: @F.%a: bool = bind_name a, %a.loc7_6.1
|
|
// CHECK:STDOUT: %b.loc7_15.1: bool = param b
|
|
// CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc7_15.1
|
|
// CHECK:STDOUT: %c.loc7_24.1: bool = param c
|
|
// CHECK:STDOUT: @F.%c: bool = bind_name c, %c.loc7_24.1
|
|
// CHECK:STDOUT: @F.%return: ref i32 = var <return slot>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F(%a: bool, %b: bool, %c: bool) -> i32 {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %a.ref: bool = name_ref a, %a
|
|
// CHECK:STDOUT: if %a.ref br !if.expr.then.loc8_10 else br !if.expr.else.loc8_10
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.then.loc8_10:
|
|
// CHECK:STDOUT: %b.ref: bool = name_ref b, %b
|
|
// CHECK:STDOUT: if %b.ref br !if.expr.then.loc8_20 else br !if.expr.else.loc8_20
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.then.loc8_20:
|
|
// CHECK:STDOUT: %.loc8_30: i32 = int_literal 1 [template = constants.%.2]
|
|
// CHECK:STDOUT: br !if.expr.result.loc8_20(%.loc8_30)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.else.loc8_20:
|
|
// CHECK:STDOUT: %.loc8_37: i32 = int_literal 2 [template = constants.%.3]
|
|
// CHECK:STDOUT: br !if.expr.result.loc8_20(%.loc8_37)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.result.loc8_20:
|
|
// CHECK:STDOUT: %.loc8_20: i32 = block_arg !if.expr.result.loc8_20
|
|
// CHECK:STDOUT: br !if.expr.result.loc8_10(%.loc8_20)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.else.loc8_10:
|
|
// CHECK:STDOUT: %c.ref: bool = name_ref c, %c
|
|
// CHECK:STDOUT: if %c.ref br !if.expr.then.loc8_44 else br !if.expr.else.loc8_44
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.then.loc8_44:
|
|
// CHECK:STDOUT: %.loc8_54: i32 = int_literal 3 [template = constants.%.4]
|
|
// CHECK:STDOUT: br !if.expr.result.loc8_44(%.loc8_54)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.else.loc8_44:
|
|
// CHECK:STDOUT: %.loc8_61: i32 = int_literal 4 [template = constants.%.5]
|
|
// CHECK:STDOUT: br !if.expr.result.loc8_44(%.loc8_61)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.result.loc8_44:
|
|
// CHECK:STDOUT: %.loc8_44: i32 = block_arg !if.expr.result.loc8_44
|
|
// CHECK:STDOUT: br !if.expr.result.loc8_10(%.loc8_44)
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !if.expr.result.loc8_10:
|
|
// CHECK:STDOUT: %.loc8_10: i32 = block_arg !if.expr.result.loc8_10
|
|
// CHECK:STDOUT: return %.loc8_10
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|