mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-28 19:14:54 +01:00
Chandler Carruthandjosh11b
7871237c15
Implements proposal #7016: `self` moves from the deduced implicit list (`fn F[self: Self]()`) to the front of the explicit list. Its type may be written explicitly (`fn F(self: Self)`) or omitted, in which case it defaults to `Self` (`fn F(self)`, `fn F(ref self)`); `self` in the implicit list is rejected. Throughout checking, `self` is modeled as the first explicit parameter. Because a method is just a function whose first parameter is `self`, it can also be called as an ordinary function with the receiver passed explicitly (`Type.M(obj, ...)`), not only as `obj.M(...)`. A new `SemIR::CallArgParamPatterns` helper chooses the parameters matched against the explicit arguments, excluding a leading `self` only when it is supplied as a method-call receiver; arity checking, conversion, and generic deduction use it. The resulting SemIR and lowering are unchanged: `self` is still `call_param0`, and witnesses, thunks, and vtables are unaffected. An omitted `self` type is parsed as a `SelfBindingPattern` node with no type expression; checking synthesizes the `Self` type so it behaves exactly like `self: Self`. However, the exact spelling used must match between a forward declaration and a definition, following #3763's rules around declaration matching. Generated functions, thunks, and C++ interop import/export build `self` as the first explicit parameter, and the `self`-type override (e.g. Derived->Base for a virtual override) applies to the explicit `self`. Placement is validated by new diagnostics: `SelfInImplicitParamList`, `SelfNotFirstParam`, and `SelfOutsideParamList`. The benchmark source generator and the documentation adopt the `(self)` shorthand; the prelude, the examples, and the test data are migrated in the following commits. Assisted-by: Claude Code with Claude Opus 4.7 --------- Co-authored-by: josh11b <15258583+josh11b@users.noreply.github.com>
113 lines
3.8 KiB
Plaintext
113 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
|
|
//
|
|
// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/primitives.carbon
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/interop/cpp/class/import/dynamic.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/interop/cpp/class/import/dynamic.carbon
|
|
|
|
// --- dynamic_base_from_cpp.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import Cpp;
|
|
|
|
inline Cpp '''
|
|
|
|
struct FurtherBase {
|
|
virtual auto further_base_func() -> int {
|
|
return 11;
|
|
}
|
|
};
|
|
|
|
struct Base: FurtherBase {
|
|
int i;
|
|
virtual auto func() -> int {
|
|
return 7;
|
|
}
|
|
};
|
|
|
|
auto Use(Base& b) -> int {
|
|
return b.func();
|
|
}
|
|
|
|
''';
|
|
|
|
base class Derived {
|
|
extend base: Cpp.Base;
|
|
virtual fn other_func(unused self) -> i32 {
|
|
return 3;
|
|
}
|
|
}
|
|
|
|
//@dump-sem-ir-begin
|
|
inline Cpp '''
|
|
|
|
// TODO: Carbon lowering should request clang to generate the vtable.
|
|
void WorkaroundToEmitCtorAndVtable() {
|
|
Carbon::Derived d;
|
|
}
|
|
|
|
// TODO: Carbon lowering should emit initialization that refers to the
|
|
// Clang-lowered vtable.
|
|
auto DoThing() -> int {
|
|
Carbon::Derived d;
|
|
return Use(d);
|
|
}
|
|
|
|
''';
|
|
//@dump-sem-ir-end
|
|
|
|
// CHECK:STDOUT: --- dynamic_base_from_cpp.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Base: type = class_type @Base [concrete]
|
|
// CHECK:STDOUT: %FurtherBase.further_base_func.type: type = fn_type @FurtherBase.further_base_func [concrete]
|
|
// CHECK:STDOUT: %FurtherBase.further_base_func: %FurtherBase.further_base_func.type = struct_value () [concrete]
|
|
// CHECK:STDOUT: %Base.func.type: type = fn_type @Base.func [concrete]
|
|
// CHECK:STDOUT: %Base.func: %Base.func.type = struct_value () [concrete]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: imports {
|
|
// CHECK:STDOUT: %Cpp: <namespace> = namespace file.%Cpp.import_cpp, [concrete] {
|
|
// CHECK:STDOUT: .Base = %Base.decl
|
|
// CHECK:STDOUT: import Cpp//...
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Base.decl: type = class_decl @Base [concrete = constants.%Base] {} {}
|
|
// CHECK:STDOUT: %FurtherBase.further_base_func.decl: %FurtherBase.further_base_func.type = fn_decl @FurtherBase.further_base_func [concrete = constants.%FurtherBase.further_base_func] {
|
|
// CHECK:STDOUT: <elided>
|
|
// CHECK:STDOUT: } {
|
|
// CHECK:STDOUT: <elided>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: %Base.func.decl: %Base.func.type = fn_decl @Base.func [concrete = constants.%Base.func] {
|
|
// CHECK:STDOUT: <elided>
|
|
// CHECK:STDOUT: } {
|
|
// CHECK:STDOUT: <elided>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: %Cpp.ref.loc35: <namespace> = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp]
|
|
// CHECK:STDOUT: inline_cpp "\n// TODO: Carbon lowering should request clang to generate the vtable.\nvoid WorkaroundToEmitCtorAndVtable() {\n Carbon::Derived d;\n}\n\n// TODO: Carbon lowering should emit initialization that refers to the\n// Clang-lowered vtable.\nauto DoThing() -> int {\n Carbon::Derived d;\n return Use(d);\n}\n\n"
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: vtable @Base.vtable {
|
|
// CHECK:STDOUT: imports.%FurtherBase.further_base_func.decl
|
|
// CHECK:STDOUT: imports.%Base.func.decl
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: vtable @FurtherBase.vtable {
|
|
// CHECK:STDOUT: imports.%FurtherBase.further_base_func.decl
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: vtable @Derived.vtable {
|
|
// CHECK:STDOUT: constants.%FurtherBase.further_base_func
|
|
// CHECK:STDOUT: constants.%Base.func
|
|
// CHECK:STDOUT: @Derived.%Derived.other_func.decl
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|