Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 139 additions & 1 deletion cpp2rust/converter/converter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,14 @@ bool Converter::VisitPointerType(clang::PointerType *type) {
return Convert(pointee_type);
}

bool Converter::VisitMemberPointerType(clang::MemberPointerType *type) {
if (type->isMemberFunctionPointer()) {
llvm::report_fatal_error("pointers to member functions are not supported");
}
StrCat("isize");
return false;
}

bool Converter::VisitDecayedType(clang::DecayedType *type) {
return Convert(type->getDecayedType());
}
Expand Down Expand Up @@ -742,7 +750,7 @@ bool Converter::TypeDerivesDefault(clang::QualType qual_type) {
return array_type->getSize().ule(32) &&
TypeDerivesDefault(array_type->getElementType());
}
if (qual_type->isArrayType()) {
if (qual_type->isArrayType() || qual_type->isMemberPointerType()) {
return false;
}

Expand Down Expand Up @@ -2710,6 +2718,18 @@ bool Converter::VisitImplicitCastExpr(clang::ImplicitCastExpr *expr) {
case clang::CastKind::CK_NullToPointer:
EmitFresh(GetDefaultAsString(type));
break;
case clang::CastKind::CK_NullToMemberPointer:
EmitFresh(GetUnboxedDefaultAsString(type));
break;
case clang::CastKind::CK_MemberPointerToBoolean:
StrCat(token::kNot);
ConvertEqualsNullPtr(sub_expr);
break;
case clang::CastKind::CK_BaseToDerivedMemberPointer:
case clang::CastKind::CK_DerivedToBaseMemberPointer:
llvm::report_fatal_error(
"conversions of pointers to members between classes are not "
"supported");
default:
// Before clang 24, a case value is a literal in a ConstantExpr.
auto *value = sub_expr;
Expand Down Expand Up @@ -2777,6 +2797,25 @@ bool Converter::VisitExplicitCastExpr(clang::ExplicitCastExpr *expr) {
ConvertIntegerToEnumeralCast(expr, sub_expr);
return false;
}
switch (expr->getCastKind()) {
case clang::CastKind::CK_NullToMemberPointer:
EmitFresh(GetUnboxedDefaultAsString(type));
return false;
case clang::CastKind::CK_MemberPointerToBoolean:
StrCat(token::kNot);
ConvertEqualsNullPtr(sub_expr);
return false;
case clang::CastKind::CK_ReinterpretMemberPointer:
Convert(sub_expr);
return false;
case clang::CastKind::CK_BaseToDerivedMemberPointer:
case clang::CastKind::CK_DerivedToBaseMemberPointer:
llvm::report_fatal_error(
"conversions of pointers to members between classes are not "
"supported");
default:
break;
}
switch (expr->getStmtClass()) {
case clang::Stmt::CXXFunctionalCastExprClass:
Convert(sub_expr, type);
Expand Down Expand Up @@ -2825,6 +2864,11 @@ bool Converter::VisitCXXRewrittenBinaryOperator(
}

bool Converter::VisitBinaryOperator(clang::BinaryOperator *expr) {
if (expr->isPtrMemOp()) {
ConvertMemberPtrAccess(expr);
return false;
}

if (expr->isAssignmentOp() && isAddrOf()) {
ConvertAssignmentRef(expr);
return false;
Expand Down Expand Up @@ -3100,6 +3144,10 @@ bool Converter::VisitUnaryOperator(clang::UnaryOperator *expr) {
Convert(sub_expr);
break;
case clang::UO_AddrOf: {
if (expr->getType()->isMemberPointerType()) {
ConvertMemberPtr(expr);
break;
}
PushParen paren(*this);
ConvertAddrOf(sub_expr, expr->getType());
break;
Expand Down Expand Up @@ -4192,6 +4240,9 @@ bool Converter::VisitImplicitValueInitExpr(clang::ImplicitValueInitExpr *expr) {
auto elem_ty = arr_ty->getElementType();
if (elem_ty->isIntegerType() && !elem_ty->isEnumeralType()) {
StrCat(std::format("[0; {}]", arr_ty->getSize().getZExtValue()));
} else if (elem_ty->isMemberDataPointerType()) {
StrCat(std::format("[{}; {}]", GetDefaultAsString(elem_ty),
arr_ty->getSize().getZExtValue()));
} else {
StrCat(
std::format("std::array::from_fn::<_, {}, _>(|_| Default::default())",
Expand Down Expand Up @@ -4378,6 +4429,10 @@ std::string Converter::GetDefaultAsString(clang::QualType qual_type) {
return init;
}

if (qual_type->isMemberDataPointerType()) {
return "-1_isize";
}

if (qual_type->isPointerType()) {
auto pointee = qual_type->getPointeeType();
if (pointee->isFunctionType()) {
Expand Down Expand Up @@ -4567,6 +4622,15 @@ void Converter::ConvertUnsignedArithOperand(clang::Expr *expr,
}

void Converter::ConvertEqualsNullPtr(clang::Expr *expr) {
if (expr->getType()->isMemberPointerType()) {
PushParen outer(*this);
{
PushParen inner(*this);
Convert(expr);
}
EmitFresh("== -1_isize");
return;
}
StrCat('(');
Convert(expr);
EmitFresh(expr->getType()->isFunctionPointerType() ? ").is_none()"
Expand Down Expand Up @@ -5151,6 +5215,80 @@ void Converter::ConvertAddrOf(clang::Expr *expr, clang::QualType pointer_type) {
}
}

void Converter::ConvertMemberPtr(clang::UnaryOperator *expr) {
if (!expr->getType()->isMemberDataPointerType()) {
llvm::report_fatal_error("pointers to member functions are not supported");
}
auto *ref = clang::cast<clang::DeclRefExpr>(expr->getSubExpr());
EmitFresh(GetMemberPtrAsString(ref->getDecl()));
}

std::string Converter::GetMemberPtrAsString(const clang::ValueDecl *member) {
std::vector<std::string> offsets;
for (auto *field : GetFieldPath(member)) {
if (field->getParent()->isUnion()) {
continue;
}
offsets.push_back(GetFieldOffsetAsString(field));
}
if (offsets.empty()) {
return "0_isize";
}
if (offsets.size() == 1) {
return std::format("({} as isize)", offsets.front());
}
std::string sum;
for (const auto &offset : offsets) {
if (!sum.empty()) {
sum += " + ";
}
sum += offset;
}
return std::format("(({}) as isize)", sum);
}

std::string Converter::GetFieldOffsetAsString(const clang::FieldDecl *field) {
return std::format("::std::mem::offset_of!({}, {})",
GetRecordName(field->getParent()),
GetNamedDeclAsString(field));
}

void Converter::ConvertMemberPtrAccess(clang::BinaryOperator *expr) {
auto object = ConvertMemberPtrObject(expr);
auto member = ConvertRValue(expr->getRHS());
auto ptr = GetMemberOfObjectAsString(std::move(object), std::move(member),
expr->getType());
if (isAddrOf()) {
EmitFresh(ptr);
return;
}
EmitMemberPtrPointee(std::move(ptr), expr->getType());
}

std::string Converter::ConvertMemberPtrObject(clang::BinaryOperator *expr) {
auto *object = expr->getLHS();
if (expr->getOpcode() == clang::BO_PtrMemI) {
return std::format("({})", ConvertRValue(object));
}
Buffer buf(*this);
{
PushParen paren(*this);
ConvertAddrOf(object, ctx_.getPointerType(object->getType()));
}
return std::move(buf).str();
}

std::string Converter::GetMemberOfObjectAsString(std::string object,
std::string member,
clang::QualType type) {
return std::format("{}.wrapping_byte_offset({}).cast::<{}>()", object, member,
ToString(type));
}

void Converter::EmitMemberPtrPointee(std::string ptr, clang::QualType type) {
EmitDeref(std::move(ptr), type);
}

void Converter::EmitDeref(std::string inner, clang::QualType pointee_type) {
auto wrap = std::exchange(autoref_mut_, std::nullopt);
PushParen outer(*this, wrap.has_value());
Expand Down
21 changes: 20 additions & 1 deletion cpp2rust/converter/converter.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {

virtual bool VisitPointerType(clang::PointerType *type);

bool VisitMemberPointerType(clang::MemberPointerType *type);

virtual std::string
ConvertFunctionPointerType(const clang::FunctionProtoType *proto);

Expand Down Expand Up @@ -469,7 +471,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
if (ty->isFunctionPointerType() || ty->isFunctionType()) {
return FunctionPointerImplementsCopy();
}
if (ty->isBuiltinType() || ty->isEnumeralType()) {
if (ty->isBuiltinType() || ty->isEnumeralType() ||
ty->isMemberDataPointerType()) {
return true;
}
if (ty->getAsRecordDecl()) {
Expand Down Expand Up @@ -868,6 +871,22 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {

virtual void ConvertAddrOf(clang::Expr *expr, clang::QualType pointer_type);

void ConvertMemberPtr(clang::UnaryOperator *expr);

std::string GetMemberPtrAsString(const clang::ValueDecl *member);

virtual std::string GetFieldOffsetAsString(const clang::FieldDecl *field);

void ConvertMemberPtrAccess(clang::BinaryOperator *expr);

virtual std::string ConvertMemberPtrObject(clang::BinaryOperator *expr);

virtual std::string GetMemberOfObjectAsString(std::string object,
std::string member,
clang::QualType type);

virtual void EmitMemberPtrPointee(std::string ptr, clang::QualType type);

virtual void ConvertDeref(clang::Expr *expr);

void EmitDeref(std::string inner, clang::QualType pointee_type);
Expand Down
13 changes: 13 additions & 0 deletions cpp2rust/converter/converter_lib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,19 @@ bool RustSizeDivergesFromC(clang::QualType qt) {
return false;
}

std::vector<const clang::FieldDecl *>
GetFieldPath(const clang::ValueDecl *member) {
std::vector<const clang::FieldDecl *> path;
if (auto *indirect = clang::dyn_cast<clang::IndirectFieldDecl>(member)) {
for (auto *link : indirect->chain()) {
path.push_back(clang::cast<clang::FieldDecl>(link));
}
} else {
path.push_back(clang::cast<clang::FieldDecl>(member));
}
return path;
}

bool IsMutatingCall(const clang::CallExpr *expr) {
if (auto *callee = expr->getDirectCallee()) {
if (auto *method = clang::dyn_cast<clang::CXXMethodDecl>(callee)) {
Expand Down
3 changes: 3 additions & 0 deletions cpp2rust/converter/converter_lib.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ bool IsMut(clang::QualType qual_type);

bool RustSizeDivergesFromC(clang::QualType qt);

std::vector<const clang::FieldDecl *>
GetFieldPath(const clang::ValueDecl *member);

bool IsMutatingCall(const clang::CallExpr *expr);

// The method of a prefix or postfix increment or decrement, or nullptr if
Expand Down
39 changes: 39 additions & 0 deletions cpp2rust/converter/models/converter_refcount.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1464,6 +1464,10 @@ std::string ConverterRefCount::ConvertFnPtrPlaceholder(clang::Expr *arg) {
}

void ConverterRefCount::ConvertEqualsNullPtr(clang::Expr *expr) {
if (expr->getType()->isMemberPointerType()) {
Converter::ConvertEqualsNullPtr(expr);
return;
}
StrCat('(');
Convert(expr);
EmitFresh(").is_null()");
Expand Down Expand Up @@ -1536,6 +1540,9 @@ bool ConverterRefCount::VisitExplicitCastExpr(clang::ExplicitCastExpr *expr) {
MarkFresh();
return false;
}
if (expr->getCastKind() == clang::CK_ReinterpretMemberPointer) {
return Converter::VisitExplicitCastExpr(expr);
}
switch (expr->getStmtClass()) {
case clang::Stmt::CXXReinterpretCastExprClass:
assert(expr->getType()->isPointerType() &&
Expand Down Expand Up @@ -2265,6 +2272,10 @@ std::string ConverterRefCount::GetDefaultAsString(clang::QualType qual_type) {
return BoxValue(std::move(init));
}

if (qual_type->isMemberDataPointerType()) {
return BoxValue("-1_isize");
}

if (!qual_type->isPointerType()) {
return Converter::GetDefaultAsString(qual_type);
}
Expand Down Expand Up @@ -2906,6 +2917,34 @@ void ConverterRefCount::ConvertAddrOf(clang::Expr *expr,
StrCat(ConvertPointer(expr));
}

std::string
ConverterRefCount::GetFieldOffsetAsString(const clang::FieldDecl *field) {
return std::format("offset_of_field!({}, {})",
GetRecordName(field->getParent()),
GetNamedDeclAsString(field));
}

std::string ConverterRefCount::GetMemberOfObjectAsString(std::string object,
std::string member,
clang::QualType type) {
PushConversionKind push(*this, ConversionKind::Pointee);
return std::format("{}.member::<{}>({})", object, ToString(type), member);
}

std::string
ConverterRefCount::ConvertMemberPtrObject(clang::BinaryOperator *expr) {
auto *object = expr->getLHS();
if (expr->getOpcode() == clang::BO_PtrMemI) {
return std::format("({})", ConvertRValue(object));
}
return std::format("({})", ConvertPointer(object));
}

void ConverterRefCount::EmitMemberPtrPointee(std::string ptr,
clang::QualType type) {
EmitPointee(std::move(ptr), type, /*fresh=*/true);
}

void ConverterRefCount::ConvertDeref(clang::Expr *expr) {
auto pointee_type = expr->getType()->getPointeeType();

Expand Down
9 changes: 9 additions & 0 deletions cpp2rust/converter/models/converter_refcount.h
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,15 @@ class ConverterRefCount final : public Converter {

void ConvertAddrOf(clang::Expr *expr, clang::QualType pointer_type) override;

std::string GetFieldOffsetAsString(const clang::FieldDecl *field) override;

std::string ConvertMemberPtrObject(clang::BinaryOperator *expr) override;

std::string GetMemberOfObjectAsString(std::string object, std::string member,
clang::QualType type) override;

void EmitMemberPtrPointee(std::string ptr, clang::QualType type) override;

void ConvertDeref(clang::Expr *expr) override;

void ConvertArrow(clang::Expr *expr) override;
Expand Down
4 changes: 4 additions & 0 deletions cpp2rust/converter/rules/rules_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ class RuleUsageCollector
if (type->isPointerType() || type->isReferenceType()) {
return AddType(type->getPointeeType());
}
if (const auto *member = type->getAs<clang::MemberPointerType>()) {
AddType(ctx_.getCanonicalTagType(member->getMostRecentCXXRecordDecl()));
return AddType(member->getPointeeType());
}
if (const auto *array = ctx_.getAsArrayType(type)) {
return AddType(array->getElementType());
}
Expand Down
Loading
Loading