mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 08:11:05 +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>
102 lines
3.8 KiB
Plaintext
102 lines
3.8 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 {
|
|
fn F(n: i32) -> i32 {
|
|
return n;
|
|
}
|
|
|
|
fn G(n: i32) -> i32;
|
|
|
|
var k: i32;
|
|
}
|
|
|
|
fn Class.G(n: i32) -> i32 {
|
|
return n;
|
|
}
|
|
|
|
fn Run() -> i32 {
|
|
return Class.F(4);
|
|
}
|
|
|
|
// CHECK:STDOUT: --- basic.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Class: type = class_type @Class [template]
|
|
// CHECK:STDOUT: %F: type = fn_type @F [template]
|
|
// CHECK:STDOUT: %.1: type = tuple_type () [template]
|
|
// CHECK:STDOUT: %struct.1: F = struct_value () [template]
|
|
// CHECK:STDOUT: %G: type = fn_type @G [template]
|
|
// CHECK:STDOUT: %struct.2: G = struct_value () [template]
|
|
// CHECK:STDOUT: %.2: type = unbound_element_type Class, i32 [template]
|
|
// CHECK:STDOUT: %.3: type = struct_type {.k: i32} [template]
|
|
// CHECK:STDOUT: %Run: type = fn_type @Run [template]
|
|
// CHECK:STDOUT: %struct.3: Run = struct_value () [template]
|
|
// CHECK:STDOUT: %.4: i32 = int_literal 4 [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
|
// CHECK:STDOUT: .Core = %Core
|
|
// CHECK:STDOUT: .Class = %Class.decl
|
|
// CHECK:STDOUT: .Run = %Run.decl
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Core: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {}
|
|
// CHECK:STDOUT: %G.decl: G = fn_decl @G [template = constants.%struct.2] {
|
|
// CHECK:STDOUT: %n.loc17_12.1: i32 = param n
|
|
// CHECK:STDOUT: @G.%n: i32 = bind_name n, %n.loc17_12.1
|
|
// CHECK:STDOUT: @G.%return: ref i32 = var <return slot>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Run.decl: Run = fn_decl @Run [template = constants.%struct.3] {
|
|
// CHECK:STDOUT: @Run.%return: ref i32 = var <return slot>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Class {
|
|
// CHECK:STDOUT: %F.decl: F = fn_decl @F [template = constants.%struct.1] {
|
|
// CHECK:STDOUT: %n.loc8_8.1: i32 = param n
|
|
// CHECK:STDOUT: %n.loc8_8.2: i32 = bind_name n, %n.loc8_8.1
|
|
// CHECK:STDOUT: %return.var.loc8: ref i32 = var <return slot>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %G.decl: G = fn_decl @G [template = constants.%struct.2] {
|
|
// CHECK:STDOUT: %n.loc12_8.1: i32 = param n
|
|
// CHECK:STDOUT: %n.loc12_8.2: i32 = bind_name n, %n.loc12_8.1
|
|
// CHECK:STDOUT: %return.var.loc12: ref i32 = var <return slot>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %.loc14: <unbound element of class Class> = field_decl k, element0 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = constants.%Class
|
|
// CHECK:STDOUT: .F = %F.decl
|
|
// CHECK:STDOUT: .G = %G.decl
|
|
// CHECK:STDOUT: .k = %.loc14
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F(@Class.%n.loc8_8.2: i32) -> i32 {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %n.ref: i32 = name_ref n, @Class.%n.loc8_8.2
|
|
// CHECK:STDOUT: return %n.ref
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @G(%n: i32) -> i32 {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n
|
|
// CHECK:STDOUT: return %n.ref
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Run() -> i32 {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class]
|
|
// CHECK:STDOUT: %F.ref: F = name_ref F, @Class.%F.decl [template = constants.%struct.1]
|
|
// CHECK:STDOUT: %.loc22_18: i32 = int_literal 4 [template = constants.%.4]
|
|
// CHECK:STDOUT: %F.call: init i32 = call %F.ref(%.loc22_18)
|
|
// CHECK:STDOUT: %.loc22_20.1: i32 = value_of_initializer %F.call
|
|
// CHECK:STDOUT: %.loc22_20.2: i32 = converted %F.call, %.loc22_20.1
|
|
// CHECK:STDOUT: return %.loc22_20.2
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|