mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 21:40:12 +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>
115 lines
4.8 KiB
Plaintext
115 lines
4.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
|
|
|
|
// `expr as T` should behave the same as `expr` if `T` is the type of `expr`.
|
|
|
|
class X {
|
|
// ...
|
|
}
|
|
|
|
fn Value(n: X) {
|
|
let m: X = n as X;
|
|
}
|
|
|
|
fn Reference(p: X*) {
|
|
let q: X* = &(*p as X);
|
|
}
|
|
|
|
fn Make() -> X;
|
|
|
|
fn Initializing() {
|
|
var x: X = (Make() as X);
|
|
}
|
|
|
|
// CHECK:STDOUT: --- identity.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %X: type = class_type @X [template]
|
|
// CHECK:STDOUT: %.1: type = struct_type {} [template]
|
|
// CHECK:STDOUT: %Value: type = fn_type @Value [template]
|
|
// CHECK:STDOUT: %.2: type = tuple_type () [template]
|
|
// CHECK:STDOUT: %struct.1: Value = struct_value () [template]
|
|
// CHECK:STDOUT: %.3: type = ptr_type {} [template]
|
|
// CHECK:STDOUT: %.4: type = ptr_type X [template]
|
|
// CHECK:STDOUT: %Reference: type = fn_type @Reference [template]
|
|
// CHECK:STDOUT: %struct.2: Reference = struct_value () [template]
|
|
// CHECK:STDOUT: %Make: type = fn_type @Make [template]
|
|
// CHECK:STDOUT: %struct.3: Make = struct_value () [template]
|
|
// CHECK:STDOUT: %Initializing: type = fn_type @Initializing [template]
|
|
// CHECK:STDOUT: %struct.4: Initializing = struct_value () [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
|
// CHECK:STDOUT: .Core = %Core
|
|
// CHECK:STDOUT: .X = %X.decl
|
|
// CHECK:STDOUT: .Value = %Value.decl
|
|
// CHECK:STDOUT: .Reference = %Reference.decl
|
|
// CHECK:STDOUT: .Make = %Make.decl
|
|
// CHECK:STDOUT: .Initializing = %Initializing.decl
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Core: <namespace> = namespace [template] {}
|
|
// CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {}
|
|
// CHECK:STDOUT: %Value.decl: Value = fn_decl @Value [template = constants.%struct.1] {
|
|
// CHECK:STDOUT: %X.ref.loc13: type = name_ref X, %X.decl [template = constants.%X]
|
|
// CHECK:STDOUT: %n.loc13_10.1: X = param n
|
|
// CHECK:STDOUT: @Value.%n: X = bind_name n, %n.loc13_10.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Reference.decl: Reference = fn_decl @Reference [template = constants.%struct.2] {
|
|
// CHECK:STDOUT: %X.ref.loc17: type = name_ref X, %X.decl [template = constants.%X]
|
|
// CHECK:STDOUT: %.loc17: type = ptr_type X [template = constants.%.4]
|
|
// CHECK:STDOUT: %p.loc17_14.1: X* = param p
|
|
// CHECK:STDOUT: @Reference.%p: X* = bind_name p, %p.loc17_14.1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Make.decl: Make = fn_decl @Make [template = constants.%struct.3] {
|
|
// CHECK:STDOUT: %X.ref.loc21: type = name_ref X, %X.decl [template = constants.%X]
|
|
// CHECK:STDOUT: @Make.%return: ref X = var <return slot>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Initializing.decl: Initializing = fn_decl @Initializing [template = constants.%struct.4] {}
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @X {
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = constants.%X
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Value(%n: X) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %X.ref.loc14_10: type = name_ref X, file.%X.decl [template = constants.%X]
|
|
// CHECK:STDOUT: %n.ref: X = name_ref n, %n
|
|
// CHECK:STDOUT: %X.ref.loc14_19: type = name_ref X, file.%X.decl [template = constants.%X]
|
|
// CHECK:STDOUT: %m: X = bind_name m, %n.ref
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Reference(%p: X*) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %X.ref.loc18_10: type = name_ref X, file.%X.decl [template = constants.%X]
|
|
// CHECK:STDOUT: %.loc18_11: type = ptr_type X [template = constants.%.4]
|
|
// CHECK:STDOUT: %p.ref: X* = name_ref p, %p
|
|
// CHECK:STDOUT: %.loc18_17: ref X = deref %p.ref
|
|
// CHECK:STDOUT: %X.ref.loc18_23: type = name_ref X, file.%X.decl [template = constants.%X]
|
|
// CHECK:STDOUT: %.loc18_15: X* = addr_of %.loc18_17
|
|
// CHECK:STDOUT: %q: X* = bind_name q, %.loc18_15
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Make() -> X;
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Initializing() {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %X.ref.loc24_10: type = name_ref X, file.%X.decl [template = constants.%X]
|
|
// CHECK:STDOUT: %x.var: ref X = var x
|
|
// CHECK:STDOUT: %x: ref X = bind_name x, %x.var
|
|
// CHECK:STDOUT: %Make.ref: Make = name_ref Make, file.%Make.decl [template = constants.%struct.3]
|
|
// CHECK:STDOUT: %.loc24: ref X = splice_block %x.var {}
|
|
// CHECK:STDOUT: %Make.call: init X = call %Make.ref() to %.loc24
|
|
// CHECK:STDOUT: %X.ref.loc24_25: type = name_ref X, file.%X.decl [template = constants.%X]
|
|
// CHECK:STDOUT: assign %x.var, %Make.call
|
|
// CHECK:STDOUT: return
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|