================
@@ -269,34 +269,61 @@ bool Compiler<Emitter>::VisitCastExpr(const CastExpr *CE)
{
}
case CK_DerivedToBaseMemberPointer: {
- assert(classifyPrim(CE->getType()) == PT_MemberPtr);
- assert(classifyPrim(SubExpr->getType()) == PT_MemberPtr);
- const auto *FromMP = SubExpr->getType()->castAs<MemberPointerType>();
- const auto *ToMP = CE->getType()->castAs<MemberPointerType>();
-
- unsigned DerivedOffset =
- Ctx.collectBaseOffset(ToMP->getMostRecentCXXRecordDecl(),
- FromMP->getMostRecentCXXRecordDecl());
+ assert(classifyPrim(CE) == PT_MemberPtr);
+ assert(classifyPrim(SubExpr) == PT_MemberPtr);
if (!this->delegate(SubExpr))
return false;
- return this->emitGetMemberPtrBasePop(DerivedOffset, CE);
+ const CXXRecordDecl *CurDecl = SubExpr->getType()
+ ->castAs<MemberPointerType>()
+ ->getMostRecentCXXRecordDecl();
+ for (const CXXBaseSpecifier *B : CE->path()) {
+ const CXXRecordDecl *ToDecl = B->getType()->getAsCXXRecordDecl();
+ unsigned DerivedOffset = Ctx.collectBaseOffset(ToDecl, CurDecl);
+
+ if (!this->emitCastMemberPtrBasePop(DerivedOffset, ToDecl, CE))
+ return false;
+ CurDecl = ToDecl;
+ }
+
+ return true;
}
case CK_BaseToDerivedMemberPointer: {
assert(classifyPrim(CE) == PT_MemberPtr);
assert(classifyPrim(SubExpr) == PT_MemberPtr);
- const auto *FromMP = SubExpr->getType()->castAs<MemberPointerType>();
- const auto *ToMP = CE->getType()->castAs<MemberPointerType>();
-
- unsigned DerivedOffset =
- Ctx.collectBaseOffset(FromMP->getMostRecentCXXRecordDecl(),
- ToMP->getMostRecentCXXRecordDecl());
if (!this->delegate(SubExpr))
return false;
- return this->emitGetMemberPtrBasePop(-DerivedOffset, CE);
+
+ const CXXRecordDecl *CurDecl = SubExpr->getType()
+ ->castAs<MemberPointerType>()
+ ->getMostRecentCXXRecordDecl();
+ // Base-to-derived member pointer casts store the path in derived-to-base
+ // order, so iterate backwards. The CXXBaseSpecifier also provides us with
+ // the wrong end of the derived->base arc, so stagger the path by one
class.
+ typedef std::reverse_iterator<CastExpr::path_const_iterator> ReverseIter;
+ for (ReverseIter PathI(CE->path_end() - 1), PathE(CE->path_begin());
+ PathI != PathE; ++PathI) {
+ const CXXRecordDecl *ToDecl = (*PathI)->getType()->getAsCXXRecordDecl();
+ unsigned DerivedOffset = Ctx.collectBaseOffset(CurDecl, ToDecl);
+
+ if (!this->emitCastMemberPtrDerivedPop(-DerivedOffset, ToDecl, CE))
----------------
shafik wrote:
I just rebased and I don't see `emitCastMemberPtrDerivedPop` in `main`, what am
I missing?
https://github.com/llvm/llvm-project/pull/179050
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
