mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
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>
184 lines
8.9 KiB
Plaintext
184 lines
8.9 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
|
|
|
|
interface Simple {
|
|
fn F();
|
|
fn G[self: Self]();
|
|
}
|
|
|
|
impl i32 as Simple {
|
|
fn F();
|
|
fn G[self: i32]();
|
|
}
|
|
|
|
fn NonInstanceCall(n: i32) {
|
|
n.(Simple.F)();
|
|
}
|
|
|
|
fn InstanceCall(n: i32) {
|
|
n.(Simple.G)();
|
|
}
|
|
|
|
fn NonInstanceCallIndirect(p: i32*) {
|
|
p->(Simple.F)();
|
|
}
|
|
|
|
fn InstanceCallIndirect(p: i32*) {
|
|
p->(Simple.G)();
|
|
}
|
|
|
|
// CHECK:STDOUT: --- compound.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %.1: type = interface_type @Simple [template]
|
|
// CHECK:STDOUT: %Self: Simple = bind_symbolic_name Self 0 [symbolic]
|
|
// CHECK:STDOUT: %F.1: type = fn_type @F.1 [template]
|
|
// CHECK:STDOUT: %.2: type = tuple_type () [template]
|
|
// CHECK:STDOUT: %struct.1: F = struct_value () [template]
|
|
// CHECK:STDOUT: %.3: type = assoc_entity_type @Simple, F [template]
|
|
// CHECK:STDOUT: %.4: <associated F in Simple> = assoc_entity element0, @Simple.%F.decl [template]
|
|
// CHECK:STDOUT: %G.1: type = fn_type @G.1 [template]
|
|
// CHECK:STDOUT: %struct.2: G = struct_value () [template]
|
|
// CHECK:STDOUT: %.5: type = assoc_entity_type @Simple, G [template]
|
|
// CHECK:STDOUT: %.6: <associated G in Simple> = assoc_entity element1, @Simple.%G.decl [template]
|
|
// CHECK:STDOUT: %F.2: type = fn_type @F.2 [template]
|
|
// CHECK:STDOUT: %struct.3: F = struct_value () [template]
|
|
// CHECK:STDOUT: %G.2: type = fn_type @G.2 [template]
|
|
// CHECK:STDOUT: %struct.4: G = struct_value () [template]
|
|
// CHECK:STDOUT: %.7: <witness> = interface_witness (%struct.3, %struct.4) [template]
|
|
// CHECK:STDOUT: %NonInstanceCall: type = fn_type @NonInstanceCall [template]
|
|
// CHECK:STDOUT: %struct.5: NonInstanceCall = struct_value () [template]
|
|
// CHECK:STDOUT: %InstanceCall: type = fn_type @InstanceCall [template]
|
|
// CHECK:STDOUT: %struct.6: InstanceCall = struct_value () [template]
|
|
// CHECK:STDOUT: %.8: type = ptr_type i32 [template]
|
|
// CHECK:STDOUT: %NonInstanceCallIndirect: type = fn_type @NonInstanceCallIndirect [template]
|
|
// CHECK:STDOUT: %struct.7: NonInstanceCallIndirect = struct_value () [template]
|
|
// CHECK:STDOUT: %InstanceCallIndirect: type = fn_type @InstanceCallIndirect [template]
|
|
// CHECK:STDOUT: %struct.8: InstanceCallIndirect = struct_value () [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
|
// CHECK:STDOUT: .Core = %Core
|
|
// CHECK:STDOUT: .Simple = %Simple.decl
|
|
// CHECK:STDOUT: .NonInstanceCall = %NonInstanceCall.decl
|
|
// CHECK:STDOUT: .InstanceCall = %InstanceCall.decl
|
|
// CHECK:STDOUT: .NonInstanceCallIndirect = %NonInstanceCallIndirect.decl
|
|
// CHECK:STDOUT: .InstanceCallIndirect = %InstanceCallIndirect.decl
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Core: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: %Simple.decl: type = interface_decl @Simple [template = constants.%.1] {}
|
|
// CHECK:STDOUT: impl_decl @impl {
|
|
// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, %Simple.decl [template = constants.%.1]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %NonInstanceCall.decl: NonInstanceCall = fn_decl @NonInstanceCall [template = constants.%struct.5] {
|
|
// CHECK:STDOUT: %n.loc17_20.1: i32 = param n
|
|
// CHECK:STDOUT: @NonInstanceCall.%n: i32 = bind_name n, %n.loc17_20.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %InstanceCall.decl: InstanceCall = fn_decl @InstanceCall [template = constants.%struct.6] {
|
|
// CHECK:STDOUT: %n.loc21_17.1: i32 = param n
|
|
// CHECK:STDOUT: @InstanceCall.%n: i32 = bind_name n, %n.loc21_17.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %NonInstanceCallIndirect.decl: NonInstanceCallIndirect = fn_decl @NonInstanceCallIndirect [template = constants.%struct.7] {
|
|
// CHECK:STDOUT: %.loc25: type = ptr_type i32 [template = constants.%.8]
|
|
// CHECK:STDOUT: %p.loc25_28.1: i32* = param p
|
|
// CHECK:STDOUT: @NonInstanceCallIndirect.%p: i32* = bind_name p, %p.loc25_28.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %InstanceCallIndirect.decl: InstanceCallIndirect = fn_decl @InstanceCallIndirect [template = constants.%struct.8] {
|
|
// CHECK:STDOUT: %.loc29: type = ptr_type i32 [template = constants.%.8]
|
|
// CHECK:STDOUT: %p.loc29_25.1: i32* = param p
|
|
// CHECK:STDOUT: @InstanceCallIndirect.%p: i32* = bind_name p, %p.loc29_25.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: interface @Simple {
|
|
// CHECK:STDOUT: %Self: Simple = bind_symbolic_name Self 0 [symbolic = constants.%Self]
|
|
// CHECK:STDOUT: %F.decl: F = fn_decl @F.1 [template = constants.%struct.1] {}
|
|
// CHECK:STDOUT: %.loc8: <associated F in Simple> = assoc_entity element0, %F.decl [template = constants.%.4]
|
|
// CHECK:STDOUT: %G.decl: G = fn_decl @G.1 [template = constants.%struct.2] {
|
|
// CHECK:STDOUT: %Self.ref: Simple = name_ref Self, %Self [symbolic = constants.%Self]
|
|
// CHECK:STDOUT: %.loc9_14.1: type = facet_type_access %Self.ref [symbolic = constants.%Self]
|
|
// CHECK:STDOUT: %.loc9_14.2: type = converted %Self.ref, %.loc9_14.1 [symbolic = constants.%Self]
|
|
// CHECK:STDOUT: %self.loc9_8.1: Self = param self
|
|
// CHECK:STDOUT: %self.loc9_8.2: Self = bind_name self, %self.loc9_8.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %.loc9_21: <associated G in Simple> = assoc_entity element1, %G.decl [template = constants.%.6]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = %Self
|
|
// CHECK:STDOUT: .F = %.loc8
|
|
// CHECK:STDOUT: .G = %.loc9_21
|
|
// CHECK:STDOUT: witness = (%F.decl, %G.decl)
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: impl @impl: i32 as Simple {
|
|
// CHECK:STDOUT: %F.decl: F = fn_decl @F.2 [template = constants.%struct.3] {}
|
|
// CHECK:STDOUT: %G.decl: G = fn_decl @G.2 [template = constants.%struct.4] {
|
|
// CHECK:STDOUT: %self.loc14_8.1: i32 = param self
|
|
// CHECK:STDOUT: %self.loc14_8.2: i32 = bind_name self, %self.loc14_8.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %.1: <witness> = interface_witness (%F.decl, %G.decl) [template = constants.%.7]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .F = %F.decl
|
|
// CHECK:STDOUT: .G = %G.decl
|
|
// CHECK:STDOUT: witness = %.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F.1();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @G.1[@Simple.%self.loc9_8.2: Self]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F.2();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @G.2[@impl.%self.loc14_8.2: i32]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @NonInstanceCall(%n: i32) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n
|
|
// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1]
|
|
// CHECK:STDOUT: %F.ref: <associated F in Simple> = name_ref F, @Simple.%.loc8 [template = constants.%.4]
|
|
// CHECK:STDOUT: %.1: F = interface_witness_access @impl.%.1, element0 [template = constants.%struct.3]
|
|
// CHECK:STDOUT: %F.call: init () = call %.1()
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @InstanceCall(%n: i32) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n
|
|
// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1]
|
|
// CHECK:STDOUT: %G.ref: <associated G in Simple> = name_ref G, @Simple.%.loc9_21 [template = constants.%.6]
|
|
// CHECK:STDOUT: %.1: G = interface_witness_access @impl.%.1, element1 [template = constants.%struct.4]
|
|
// CHECK:STDOUT: %.loc22: <bound method> = bound_method %n.ref, %.1
|
|
// CHECK:STDOUT: %G.call: init () = call %.loc22(%n.ref)
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @NonInstanceCallIndirect(%p: i32*) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %p.ref: i32* = name_ref p, %p
|
|
// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1]
|
|
// CHECK:STDOUT: %F.ref: <associated F in Simple> = name_ref F, @Simple.%.loc8 [template = constants.%.4]
|
|
// CHECK:STDOUT: %.loc26: ref i32 = deref %p.ref
|
|
// CHECK:STDOUT: %.1: F = interface_witness_access @impl.%.1, element0 [template = constants.%struct.3]
|
|
// CHECK:STDOUT: %F.call: init () = call %.1()
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @InstanceCallIndirect(%p: i32*) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %p.ref: i32* = name_ref p, %p
|
|
// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1]
|
|
// CHECK:STDOUT: %G.ref: <associated G in Simple> = name_ref G, @Simple.%.loc9_21 [template = constants.%.6]
|
|
// CHECK:STDOUT: %.loc30_4.1: ref i32 = deref %p.ref
|
|
// CHECK:STDOUT: %.1: G = interface_witness_access @impl.%.1, element1 [template = constants.%struct.4]
|
|
// CHECK:STDOUT: %.loc30_4.2: <bound method> = bound_method %.loc30_4.1, %.1
|
|
// CHECK:STDOUT: %.loc30_4.3: i32 = bind_value %.loc30_4.1
|
|
// CHECK:STDOUT: %G.call: init () = call %.loc30_4.2(%.loc30_4.3)
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|