mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-03 13:05:49 +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>
104 lines
5.0 KiB
Plaintext
104 lines
5.0 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 C {
|
|
fn Member[self: Self]();
|
|
var field: C*;
|
|
}
|
|
|
|
fn Foo(ptr: C*) {
|
|
(*ptr).Member();
|
|
ptr->Member();
|
|
|
|
(*ptr).field;
|
|
ptr->field;
|
|
|
|
ptr->field->field;
|
|
}
|
|
|
|
// CHECK:STDOUT: --- arrow.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %C: type = class_type @C [template]
|
|
// CHECK:STDOUT: %Member: type = fn_type @Member [template]
|
|
// CHECK:STDOUT: %.1: type = tuple_type () [template]
|
|
// CHECK:STDOUT: %struct.1: Member = struct_value () [template]
|
|
// CHECK:STDOUT: %.2: type = ptr_type C [template]
|
|
// CHECK:STDOUT: %.3: type = unbound_element_type C, C* [template]
|
|
// CHECK:STDOUT: %.4: type = struct_type {.field: C*} [template]
|
|
// CHECK:STDOUT: %Foo: type = fn_type @Foo [template]
|
|
// CHECK:STDOUT: %struct.2: Foo = struct_value () [template]
|
|
// CHECK:STDOUT: %.5: type = ptr_type {.field: C*} [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
|
// CHECK:STDOUT: .Core = %Core
|
|
// CHECK:STDOUT: .C = %C.decl
|
|
// CHECK:STDOUT: .Foo = %Foo.decl
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Core: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {}
|
|
// CHECK:STDOUT: %Foo.decl: Foo = fn_decl @Foo [template = constants.%struct.2] {
|
|
// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C]
|
|
// CHECK:STDOUT: %.loc12: type = ptr_type C [template = constants.%.2]
|
|
// CHECK:STDOUT: %ptr.loc12_8.1: C* = param ptr
|
|
// CHECK:STDOUT: @Foo.%ptr: C* = bind_name ptr, %ptr.loc12_8.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @C {
|
|
// CHECK:STDOUT: %Member.decl: Member = fn_decl @Member [template = constants.%struct.1] {
|
|
// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [template = constants.%C]
|
|
// CHECK:STDOUT: %self.loc8_13.1: C = param self
|
|
// CHECK:STDOUT: %self.loc8_13.2: C = bind_name self, %self.loc8_13.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C]
|
|
// CHECK:STDOUT: %.loc9_15: type = ptr_type C [template = constants.%.2]
|
|
// CHECK:STDOUT: %.loc9_12: <unbound element of class C> = field_decl field, element0 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = constants.%C
|
|
// CHECK:STDOUT: .Member = %Member.decl
|
|
// CHECK:STDOUT: .field = %.loc9_12
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Member[@C.%self.loc8_13.2: C]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Foo(%ptr: C*) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %ptr.ref.loc13: C* = name_ref ptr, %ptr
|
|
// CHECK:STDOUT: %.loc13_4.1: ref C = deref %ptr.ref.loc13
|
|
// CHECK:STDOUT: %Member.ref.loc13: Member = name_ref Member, @C.%Member.decl [template = constants.%struct.1]
|
|
// CHECK:STDOUT: %.loc13_9: <bound method> = bound_method %.loc13_4.1, %Member.ref.loc13
|
|
// CHECK:STDOUT: %.loc13_4.2: C = bind_value %.loc13_4.1
|
|
// CHECK:STDOUT: %Member.call.loc13: init () = call %.loc13_9(%.loc13_4.2)
|
|
// CHECK:STDOUT: %ptr.ref.loc14: C* = name_ref ptr, %ptr
|
|
// CHECK:STDOUT: %.loc14_6.1: ref C = deref %ptr.ref.loc14
|
|
// CHECK:STDOUT: %Member.ref.loc14: Member = name_ref Member, @C.%Member.decl [template = constants.%struct.1]
|
|
// CHECK:STDOUT: %.loc14_6.2: <bound method> = bound_method %.loc14_6.1, %Member.ref.loc14
|
|
// CHECK:STDOUT: %.loc14_6.3: C = bind_value %.loc14_6.1
|
|
// CHECK:STDOUT: %Member.call.loc14: init () = call %.loc14_6.2(%.loc14_6.3)
|
|
// CHECK:STDOUT: %ptr.ref.loc16: C* = name_ref ptr, %ptr
|
|
// CHECK:STDOUT: %.loc16_4: ref C = deref %ptr.ref.loc16
|
|
// CHECK:STDOUT: %field.ref.loc16: <unbound element of class C> = name_ref field, @C.%.loc9_12 [template = @C.%.loc9_12]
|
|
// CHECK:STDOUT: %.loc16_9: ref C* = class_element_access %.loc16_4, element0
|
|
// CHECK:STDOUT: %ptr.ref.loc17: C* = name_ref ptr, %ptr
|
|
// CHECK:STDOUT: %.loc17_6.1: ref C = deref %ptr.ref.loc17
|
|
// CHECK:STDOUT: %field.ref.loc17: <unbound element of class C> = name_ref field, @C.%.loc9_12 [template = @C.%.loc9_12]
|
|
// CHECK:STDOUT: %.loc17_6.2: ref C* = class_element_access %.loc17_6.1, element0
|
|
// CHECK:STDOUT: %ptr.ref.loc19: C* = name_ref ptr, %ptr
|
|
// CHECK:STDOUT: %.loc19_6.1: ref C = deref %ptr.ref.loc19
|
|
// CHECK:STDOUT: %field.ref.loc19_6: <unbound element of class C> = name_ref field, @C.%.loc9_12 [template = @C.%.loc9_12]
|
|
// CHECK:STDOUT: %.loc19_6.2: ref C* = class_element_access %.loc19_6.1, element0
|
|
// CHECK:STDOUT: %.loc19_6.3: C* = bind_value %.loc19_6.2
|
|
// CHECK:STDOUT: %.loc19_13.1: ref C = deref %.loc19_6.3
|
|
// CHECK:STDOUT: %field.ref.loc19_13: <unbound element of class C> = name_ref field, @C.%.loc9_12 [template = @C.%.loc9_12]
|
|
// CHECK:STDOUT: %.loc19_13.2: ref C* = class_element_access %.loc19_13.1, element0
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|