mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
C++ interop: Support importing operators defined in namespaces (#6024)
C++ Interop Demo:
```c++
// my_number.h
namespace MyNamespace {
class MyNumber {
public:
explicit MyNumber(int value) : value_(value) {}
auto value() const -> int { return value_; }
private:
int value_;
};
auto operator+(MyNumber lhs, MyNumber rhs) -> MyNumber;
} // namespace MyNamespace
```
```c++
// my_number.cpp
#include "my_number.h"
namespace MyNamespace {
auto operator+(MyNumber lhs, MyNumber rhs) -> MyNumber {
return MyNumber(lhs.value() + rhs.value());
}
} // namespace MyNamespace
```
```carbon
// main.carbon
library "Main";
import Core library "io";
import Cpp library "my_number.h";
fn Run() -> i32 {
let n1: Cpp.MyNamespace.MyNumber = Cpp.MyNamespace.MyNumber.MyNumber(5);
Core.Print(n1.value());
let n2: Cpp.MyNamespace.MyNumber = Cpp.MyNamespace.MyNumber.MyNumber(7);
Core.Print(n2.value());
let n3: Cpp.MyNamespace.MyNumber = n1 + n2;
Core.Print(n3.value());
return 0;
}
```
Before this change:
```
$ bazel-bin/toolchain/carbon compile main.carbon
main.carbon:13:38: error: cannot access member of interface `Core.AddWith(Cpp.MyNamespace.MyNumber)` in type `Cpp.MyNamespace.MyNumber` that does not implement that interface
let n3: Cpp.MyNamespace.MyNumber = n1 + n2;
^~~~~~~
```
With this change:
```shell
$ clang -c my_number.cpp
$ bazel-bin/toolchain/carbon compile main.carbon
$ bazel-bin/toolchain/carbon link my_number.o main.o --output=demo
$ ./demo
5
7
12
```
Part of https://github.com/carbon-language/carbon-lang/issues/5995.
This commit is contained in:
@@ -4,13 +4,17 @@
|
||||
|
||||
#include "toolchain/check/operator.h"
|
||||
|
||||
#include <optional>
|
||||
|
||||
#include "toolchain/check/call.h"
|
||||
#include "toolchain/check/context.h"
|
||||
#include "toolchain/check/generic.h"
|
||||
#include "toolchain/check/import_cpp.h"
|
||||
#include "toolchain/check/member_access.h"
|
||||
#include "toolchain/check/name_lookup.h"
|
||||
#include "toolchain/sem_ir/class.h"
|
||||
#include "toolchain/sem_ir/ids.h"
|
||||
#include "toolchain/sem_ir/name_scope.h"
|
||||
#include "toolchain/sem_ir/typed_insts.h"
|
||||
|
||||
namespace Carbon::Check {
|
||||
@@ -35,21 +39,35 @@ static auto GetOperatorOpFunction(Context& context, SemIR::LocId loc_id,
|
||||
op_name_id);
|
||||
}
|
||||
|
||||
// Returns whether the type of the instruction is a C++ class.
|
||||
static auto IsOfCppClassType(Context& context, SemIR::InstId inst_id) -> bool {
|
||||
// If the instruction is a C++ class, returns its parent scope id. Otherwise
|
||||
// returns `std::nullopt`.
|
||||
static auto GetCppClassTypeParentScope(Context& context, SemIR::InstId inst_id)
|
||||
-> std::optional<SemIR::NameScopeId> {
|
||||
auto class_type = context.insts().TryGetAs<SemIR::ClassType>(
|
||||
context.types().GetInstId(context.insts().Get(inst_id).type_id()));
|
||||
if (!class_type) {
|
||||
// Not a class.
|
||||
return false;
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
const auto& class_info = context.classes().Get(class_type->class_id);
|
||||
if (!class_info.is_complete()) {
|
||||
return false;
|
||||
const SemIR::Class& class_info = context.classes().Get(class_type->class_id);
|
||||
if (!class_info.is_complete() ||
|
||||
!context.name_scopes().Get(class_info.scope_id).is_cpp_scope()) {
|
||||
// Not a C++ class.
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
return context.name_scopes().Get(class_info.scope_id).is_cpp_scope();
|
||||
SemIR::NameScopeId parent_scope_id = class_info.parent_scope_id;
|
||||
do {
|
||||
SemIR::NameScope& scope = context.name_scopes().Get(parent_scope_id);
|
||||
if (context.insts().Is<SemIR::Namespace>(scope.inst_id())) {
|
||||
break;
|
||||
}
|
||||
parent_scope_id = scope.parent_scope_id();
|
||||
|
||||
} while (parent_scope_id.has_value());
|
||||
|
||||
return parent_scope_id;
|
||||
}
|
||||
|
||||
auto BuildUnaryOperator(Context& context, SemIR::LocId loc_id, Operator op,
|
||||
@@ -60,9 +78,13 @@ auto BuildUnaryOperator(Context& context, SemIR::LocId loc_id, Operator op,
|
||||
// the C++ operator.
|
||||
// TODO: Change impl lookup instead. See
|
||||
// https://github.com/carbon-language/carbon-lang/blob/db0a00d713015436844c55e7ac190a0f95556499/toolchain/check/operator.cpp#L76
|
||||
if (IsOfCppClassType(context, operand_id)) {
|
||||
// TODO: We should do ADL-only lookup for operators
|
||||
// (`Sema::ArgumentDependentLookup`), when we support mapping Carbon types
|
||||
// into C++ types.
|
||||
auto cpp_parent_scope_id = GetCppClassTypeParentScope(context, operand_id);
|
||||
if (cpp_parent_scope_id) {
|
||||
SemIR::ScopeLookupResult cpp_lookup_result =
|
||||
ImportOperatorFromCpp(context, loc_id, op);
|
||||
ImportOperatorFromCpp(context, loc_id, *cpp_parent_scope_id, op);
|
||||
if (cpp_lookup_result.is_found()) {
|
||||
return PerformCall(context, loc_id, cpp_lookup_result.target_inst_id(),
|
||||
{operand_id});
|
||||
@@ -95,9 +117,19 @@ auto BuildBinaryOperator(Context& context, SemIR::LocId loc_id, Operator op,
|
||||
// https://github.com/carbon-language/carbon-lang/pull/5996/files/5d01fa69511b76f87efbc0387f5e40abcf4c911a#r2308666348
|
||||
// and
|
||||
// https://github.com/carbon-language/carbon-lang/pull/5996/files/5d01fa69511b76f87efbc0387f5e40abcf4c911a#r2308664536
|
||||
if (IsOfCppClassType(context, lhs_id) || IsOfCppClassType(context, rhs_id)) {
|
||||
// TODO: We should do ADL-only lookup for operators
|
||||
// (`Sema::ArgumentDependentLookup`), when we support mapping Carbon types
|
||||
// into C++ types.
|
||||
llvm::SmallVector<SemIR::NameScopeId, 2> cpp_operand_parent_scope_ids;
|
||||
for (SemIR::InstId operand_id : {lhs_id, rhs_id}) {
|
||||
auto cpp_parent_scope_id = GetCppClassTypeParentScope(context, operand_id);
|
||||
if (!cpp_parent_scope_id || llvm::is_contained(cpp_operand_parent_scope_ids,
|
||||
*cpp_parent_scope_id)) {
|
||||
continue;
|
||||
}
|
||||
cpp_operand_parent_scope_ids.push_back(*cpp_parent_scope_id);
|
||||
SemIR::ScopeLookupResult cpp_lookup_result =
|
||||
ImportOperatorFromCpp(context, loc_id, op);
|
||||
ImportOperatorFromCpp(context, loc_id, *cpp_parent_scope_id, op);
|
||||
if (cpp_lookup_result.is_found()) {
|
||||
return PerformCall(context, loc_id, cpp_lookup_result.target_inst_id(),
|
||||
{lhs_id, rhs_id});
|
||||
|
||||
Reference in New Issue
Block a user