- Address review feedback.
Hi rnk, rsmith,
http://llvm-reviews.chandlerc.com/D2548
CHANGE SINCE LAST DIFF
http://llvm-reviews.chandlerc.com/D2548?vs=6456&id=6475#toc
Files:
include/clang/AST/DeclCXX.h
include/clang/Basic/Attr.td
lib/AST/MicrosoftCXXABI.cpp
lib/CodeGen/MicrosoftCXXABI.cpp
lib/Sema/SemaType.cpp
test/SemaCXX/microsoft-abi-ptm.cpp
Index: include/clang/AST/DeclCXX.h
===================================================================
--- include/clang/AST/DeclCXX.h
+++ include/clang/AST/DeclCXX.h
@@ -17,6 +17,7 @@
#define LLVM_CLANG_AST_DECLCXX_H
#include "clang/AST/ASTUnresolvedSet.h"
+#include "clang/AST/Attr.h"
#include "clang/AST/Decl.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
@@ -258,16 +259,6 @@
TypeSourceInfo *getTypeSourceInfo() const { return BaseTypeInfo; }
};
-/// The inheritance model to use for member pointers of a given CXXRecordDecl.
-enum MSInheritanceModel {
- MSIM_Single,
- MSIM_SinglePolymorphic,
- MSIM_Multiple,
- MSIM_MultiplePolymorphic,
- MSIM_Virtual,
- MSIM_Unspecified
-};
-
/// \brief Represents a C++ struct/union/class.
///
/// FIXME: This class will disappear once we've properly taught RecordDecl
@@ -1608,7 +1599,9 @@
}
/// \brief Returns the inheritance model used for this record.
- MSInheritanceModel getMSInheritanceModel() const;
+ MSInheritanceAttr::MSInheritanceModel getMSInheritanceModel() const;
+ /// \brief Locks-in the inheritance model for this class.
+ void setMSInheritanceModel();
/// \brief Determine whether this lambda expression was known to be dependent
/// at the time it was created, even if its context does not appear to be
Index: include/clang/Basic/Attr.td
===================================================================
--- include/clang/Basic/Attr.td
+++ include/clang/Basic/Attr.td
@@ -1352,9 +1352,20 @@
Accessor<"IsMultiple", [Keyword<"__multiple_inheritance">]>,
Accessor<"IsVirtual", [Keyword<"__virtual_inheritance">]>,
Accessor<"IsUnspecified", [Keyword<"">]>];
- // This index is based off the Spellings list and corresponds to the empty
- // keyword "spelling."
- let AdditionalMembers = [{static const int UnspecifiedSpellingIndex = 3;}];
+ // This list is carefully ordered to match the Spelling Kinds.
+ let AdditionalMembers = [{
+ /// The inheritance model to use for member pointers of a given CXXRecordDecl.
+ enum MSInheritanceModel {
+ MSIM_Single,
+ MSIM_Multiple,
+ MSIM_Virtual,
+ MSIM_Unspecified
+ };
+
+ static MSInheritanceAttr *Create(SourceRange R, ASTContext &C, MSInheritanceModel MSIM) {
+ return ::new (C) MSInheritanceAttr(R, C, MSIM);
+ }
+ }];
}
def Unaligned : IgnoredAttr {
Index: lib/AST/MicrosoftCXXABI.cpp
===================================================================
--- lib/AST/MicrosoftCXXABI.cpp
+++ lib/AST/MicrosoftCXXABI.cpp
@@ -92,28 +92,43 @@
return false;
}
-static MSInheritanceModel MSInheritanceAttrToModel(MSInheritanceAttr *Attr) {
+static MSInheritanceAttr::MSInheritanceModel
+MSInheritanceAttrToModel(const MSInheritanceAttr *Attr) {
if (Attr->IsSingle())
- return MSIM_Single;
+ return MSInheritanceAttr::MSIM_Single;
else if (Attr->IsMultiple())
- return MSIM_Multiple;
+ return MSInheritanceAttr::MSIM_Multiple;
else if (Attr->IsVirtual())
- return MSIM_Virtual;
+ return MSInheritanceAttr::MSIM_Virtual;
assert(Attr->IsUnspecified() && "Expected unspecified inheritance attr");
- return MSIM_Unspecified;
+ return MSInheritanceAttr::MSIM_Unspecified;
}
-MSInheritanceModel CXXRecordDecl::getMSInheritanceModel() const {
- if (MSInheritanceAttr *IA = this->getAttr<MSInheritanceAttr>())
- return MSInheritanceAttrToModel(IA);
- // If there was no explicit attribute, the record must be defined already, and
- // we can figure out the inheritance model from its other properties.
- if (this->getNumVBases() > 0)
- return MSIM_Virtual;
- if (usesMultipleInheritanceModel(this))
- return this->isPolymorphic() ? MSIM_MultiplePolymorphic : MSIM_Multiple;
- return this->isPolymorphic() ? MSIM_SinglePolymorphic : MSIM_Single;
+static MSInheritanceAttr::MSInheritanceModel
+calculateInheritanceModel(const CXXRecordDecl *RD) {
+ if (!RD->hasDefinition())
+ return MSInheritanceAttr::MSIM_Unspecified;
+ if (RD->getNumVBases() > 0)
+ return MSInheritanceAttr::MSIM_Virtual;
+ if (usesMultipleInheritanceModel(RD))
+ return MSInheritanceAttr::MSIM_Multiple;
+ return MSInheritanceAttr::MSIM_Single;
+}
+
+MSInheritanceAttr::MSInheritanceModel
+CXXRecordDecl::getMSInheritanceModel() const {
+ MSInheritanceAttr *IA = getAttr<MSInheritanceAttr>();
+ assert(IA && "Expected MSInheritanceAttr on the CXXRecordDecl!");
+ return MSInheritanceAttrToModel(IA);
+}
+
+void CXXRecordDecl::setMSInheritanceModel() {
+ if (hasAttr<MSInheritanceAttr>())
+ return;
+
+ addAttr(::new (getASTContext()) MSInheritanceAttr(
+ getSourceRange(), getASTContext(), calculateInheritanceModel(this)));
}
// Returns the number of pointer and integer slots used to represent a member
@@ -147,35 +162,39 @@
static std::pair<unsigned, unsigned>
getMSMemberPointerSlots(const MemberPointerType *MPT) {
const CXXRecordDecl *RD = MPT->getClass()->getAsCXXRecordDecl();
- MSInheritanceModel Inheritance = RD->getMSInheritanceModel();
- unsigned Ptrs;
+ MSInheritanceAttr::MSInheritanceModel Inheritance =
+ RD->getMSInheritanceModel();
+ unsigned Ptrs = 0;
unsigned Ints = 0;
if (MPT->isMemberFunctionPointer()) {
// Member function pointers are a struct of a function pointer followed by a
// variable number of ints depending on the inheritance model used. The
// function pointer is a real function if it is non-virtual and a vftable
// slot thunk if it is virtual. The ints select the object base passed for
// the 'this' pointer.
- Ptrs = 1; // First slot is always a function pointer.
+ Ptrs = 1; // First slot is always a function pointer.
switch (Inheritance) {
- case MSIM_Unspecified: ++Ints; // VBTableOffset
- case MSIM_Virtual: ++Ints; // VirtualBaseAdjustmentOffset
- case MSIM_MultiplePolymorphic:
- case MSIM_Multiple: ++Ints; // NonVirtualBaseAdjustment
- case MSIM_SinglePolymorphic:
- case MSIM_Single: break; // Nothing
+ case MSInheritanceAttr::MSIM_Unspecified:
+ ++Ints; // VBTableOffset
+ case MSInheritanceAttr::MSIM_Virtual:
+ ++Ints; // VirtualBaseAdjustmentOffset
+ case MSInheritanceAttr::MSIM_Multiple:
+ ++Ints; // NonVirtualBaseAdjustment
+ case MSInheritanceAttr::MSIM_Single:
+ break; // Nothing
}
} else {
// Data pointers are an aggregate of ints. The first int is an offset
// followed by vbtable-related offsets.
- Ptrs = 0;
+ Ints = 1; // We always have a field offset.
switch (Inheritance) {
- case MSIM_Unspecified: ++Ints; // VBTableOffset
- case MSIM_Virtual: ++Ints; // VirtualBaseAdjustmentOffset
- case MSIM_MultiplePolymorphic:
- case MSIM_Multiple: // Nothing
- case MSIM_SinglePolymorphic:
- case MSIM_Single: ++Ints; // Field offset
+ case MSInheritanceAttr::MSIM_Unspecified:
+ ++Ints; // VBTableOffset
+ case MSInheritanceAttr::MSIM_Virtual:
+ ++Ints; // VirtualBaseAdjustmentOffset
+ case MSInheritanceAttr::MSIM_Multiple:
+ case MSInheritanceAttr::MSIM_Single:
+ break; // Nothing
}
}
return std::make_pair(Ptrs, Ints);
Index: lib/CodeGen/MicrosoftCXXABI.cpp
===================================================================
--- lib/CodeGen/MicrosoftCXXABI.cpp
+++ lib/CodeGen/MicrosoftCXXABI.cpp
@@ -1322,35 +1322,37 @@
}
// Member pointer helpers.
-static bool hasVBPtrOffsetField(MSInheritanceModel Inheritance) {
- return Inheritance == MSIM_Unspecified;
+static bool
+hasVBPtrOffsetField(MSInheritanceAttr::MSInheritanceModel Inheritance) {
+ return Inheritance == MSInheritanceAttr::MSIM_Unspecified;
}
static bool hasOnlyOneField(bool IsMemberFunction,
- MSInheritanceModel Inheritance) {
- return Inheritance <= MSIM_SinglePolymorphic ||
- (!IsMemberFunction && Inheritance <= MSIM_MultiplePolymorphic);
+ MSInheritanceAttr::MSInheritanceModel Inheritance) {
+ return Inheritance <= MSInheritanceAttr::MSIM_Single ||
+ (!IsMemberFunction && Inheritance <= MSInheritanceAttr::MSIM_Multiple);
}
// Only member pointers to functions need a this adjustment, since it can be
// combined with the field offset for data pointers.
-static bool hasNonVirtualBaseAdjustmentField(bool IsMemberFunction,
- MSInheritanceModel Inheritance) {
- return (IsMemberFunction && Inheritance >= MSIM_Multiple);
+static bool hasNonVirtualBaseAdjustmentField(
+ bool IsMemberFunction, MSInheritanceAttr::MSInheritanceModel Inheritance) {
+ return IsMemberFunction && Inheritance >= MSInheritanceAttr::MSIM_Multiple;
}
-static bool hasVirtualBaseAdjustmentField(MSInheritanceModel Inheritance) {
- return Inheritance >= MSIM_Virtual;
+static bool hasVirtualBaseAdjustmentField(
+ MSInheritanceAttr::MSInheritanceModel Inheritance) {
+ return Inheritance >= MSInheritanceAttr::MSIM_Virtual;
}
// Use zero for the field offset of a null data member pointer if we can
// guarantee that zero is not a valid field offset, or if the member pointer has
// multiple fields. Polymorphic classes have a vfptr at offset zero, so we can
// use zero for null. If there are multiple fields, we can use zero even if it
// is a valid field offset because null-ness testing will check the other
// fields.
-static bool nullFieldOffsetIsZero(MSInheritanceModel Inheritance) {
- return Inheritance != MSIM_Multiple && Inheritance != MSIM_Single;
+static bool nullFieldOffsetIsZero(const CXXRecordDecl *RD) {
+ return RD->isDynamicClass();
}
bool MicrosoftCXXABI::isZeroInitializable(const MemberPointerType *MPT) {
@@ -1363,15 +1365,17 @@
// we can't zero initialize. The field offset is sometimes also -1 if 0 is a
// valid field offset.
const CXXRecordDecl *RD = MPT->getClass()->getAsCXXRecordDecl();
- MSInheritanceModel Inheritance = RD->getMSInheritanceModel();
+ MSInheritanceAttr::MSInheritanceModel Inheritance =
+ RD->getMSInheritanceModel();
return (!hasVirtualBaseAdjustmentField(Inheritance) &&
- nullFieldOffsetIsZero(Inheritance));
+ nullFieldOffsetIsZero(RD));
}
llvm::Type *
MicrosoftCXXABI::ConvertMemberPointerType(const MemberPointerType *MPT) {
const CXXRecordDecl *RD = MPT->getClass()->getAsCXXRecordDecl();
- MSInheritanceModel Inheritance = RD->getMSInheritanceModel();
+ MSInheritanceAttr::MSInheritanceModel Inheritance =
+ RD->getMSInheritanceModel();
llvm::SmallVector<llvm::Type *, 4> fields;
if (MPT->isMemberFunctionPointer())
fields.push_back(CGM.VoidPtrTy); // FunctionPointerOrVirtualThunk
@@ -1396,12 +1400,13 @@
llvm::SmallVectorImpl<llvm::Constant *> &fields) {
assert(fields.empty());
const CXXRecordDecl *RD = MPT->getClass()->getAsCXXRecordDecl();
- MSInheritanceModel Inheritance = RD->getMSInheritanceModel();
+ MSInheritanceAttr::MSInheritanceModel Inheritance =
+ RD->getMSInheritanceModel();
if (MPT->isMemberFunctionPointer()) {
// FunctionPointerOrVirtualThunk
fields.push_back(llvm::Constant::getNullValue(CGM.VoidPtrTy));
} else {
- if (nullFieldOffsetIsZero(Inheritance))
+ if (nullFieldOffsetIsZero(RD))
fields.push_back(getZeroInt()); // FieldOffset
else
fields.push_back(getAllOnesInt()); // FieldOffset
@@ -1433,7 +1438,8 @@
const CXXRecordDecl *RD,
CharUnits NonVirtualBaseAdjustment)
{
- MSInheritanceModel Inheritance = RD->getMSInheritanceModel();
+ MSInheritanceAttr::MSInheritanceModel Inheritance =
+ RD->getMSInheritanceModel();
// Single inheritance class member pointer are represented as scalars instead
// of aggregates.
@@ -1579,7 +1585,8 @@
// If this is a single field member pointer (single inheritance), this is a
// single icmp.
const CXXRecordDecl *RD = MPT->getClass()->getAsCXXRecordDecl();
- MSInheritanceModel Inheritance = RD->getMSInheritanceModel();
+ MSInheritanceAttr::MSInheritanceModel Inheritance =
+ RD->getMSInheritanceModel();
if (hasOnlyOneField(MPT->isMemberFunctionPointer(), Inheritance))
return Builder.CreateICmp(Eq, L, R);
@@ -1761,7 +1768,8 @@
CGF.ConvertTypeForMem(MPT->getPointeeType())->getPointerTo(AS);
CGBuilderTy &Builder = CGF.Builder;
const CXXRecordDecl *RD = MPT->getClass()->getAsCXXRecordDecl();
- MSInheritanceModel Inheritance = RD->getMSInheritanceModel();
+ MSInheritanceAttr::MSInheritanceModel Inheritance =
+ RD->getMSInheritanceModel();
// Extract the fields we need, regardless of model. We'll apply them if we
// have them.
@@ -1795,7 +1803,7 @@
return Builder.CreateBitCast(Addr, PType);
}
-static MSInheritanceModel
+static MSInheritanceAttr::MSInheritanceModel
getInheritanceFromMemptr(const MemberPointerType *MPT) {
return MPT->getClass()->getAsCXXRecordDecl()->getMSInheritanceModel();
}
@@ -1817,15 +1825,17 @@
const MemberPointerType *SrcTy =
E->getSubExpr()->getType()->castAs<MemberPointerType>();
const MemberPointerType *DstTy = E->getType()->castAs<MemberPointerType>();
- MSInheritanceModel SrcInheritance = getInheritanceFromMemptr(SrcTy);
- MSInheritanceModel DstInheritance = getInheritanceFromMemptr(DstTy);
bool IsFunc = SrcTy->isMemberFunctionPointer();
// If the classes use the same null representation, reinterpret_cast is a nop.
bool IsReinterpret = E->getCastKind() == CK_ReinterpretMemberPointer;
- if (IsReinterpret && (IsFunc ||
- nullFieldOffsetIsZero(SrcInheritance) ==
- nullFieldOffsetIsZero(DstInheritance)))
+ if (IsReinterpret && IsFunc)
+ return Src;
+
+ CXXRecordDecl *SrcRD = SrcTy->getClass()->getAsCXXRecordDecl();
+ CXXRecordDecl *DstRD = DstTy->getClass()->getAsCXXRecordDecl();
+ if (IsReinterpret &&
+ nullFieldOffsetIsZero(SrcRD) == nullFieldOffsetIsZero(DstRD))
return Src;
CGBuilderTy &Builder = CGF.Builder;
@@ -1854,6 +1864,8 @@
llvm::Value *NonVirtualBaseAdjustment = 0;
llvm::Value *VirtualBaseAdjustmentOffset = 0;
llvm::Value *VBPtrOffset = 0;
+ MSInheritanceAttr::MSInheritanceModel SrcInheritance =
+ SrcRD->getMSInheritanceModel();
if (!hasOnlyOneField(IsFunc, SrcInheritance)) {
// We need to extract values.
unsigned I = 0;
@@ -1884,6 +1896,8 @@
// FIXME PR15713: Support conversions through virtually derived classes.
// Recompose dst from the null struct and the adjusted fields from src.
+ MSInheritanceAttr::MSInheritanceModel DstInheritance =
+ DstRD->getMSInheritanceModel();
llvm::Value *Dst;
if (hasOnlyOneField(IsFunc, DstInheritance)) {
Dst = FirstField;
@@ -1929,8 +1943,10 @@
if (E->getCastKind() == CK_ReinterpretMemberPointer)
return Src;
- MSInheritanceModel SrcInheritance = getInheritanceFromMemptr(SrcTy);
- MSInheritanceModel DstInheritance = getInheritanceFromMemptr(DstTy);
+ MSInheritanceAttr::MSInheritanceModel SrcInheritance =
+ getInheritanceFromMemptr(SrcTy);
+ MSInheritanceAttr::MSInheritanceModel DstInheritance =
+ getInheritanceFromMemptr(DstTy);
// Decompose src.
llvm::Constant *FirstField = Src;
@@ -1997,7 +2013,8 @@
CGM.getTypes().arrangeCXXMethodType(RD, FPT));
CGBuilderTy &Builder = CGF.Builder;
- MSInheritanceModel Inheritance = RD->getMSInheritanceModel();
+ MSInheritanceAttr::MSInheritanceModel Inheritance =
+ RD->getMSInheritanceModel();
// Extract the fields we need, regardless of model. We'll apply them if we
// have them.
Index: lib/Sema/SemaType.cpp
===================================================================
--- lib/Sema/SemaType.cpp
+++ lib/Sema/SemaType.cpp
@@ -1751,35 +1751,6 @@
return QualType();
}
- // C++ allows the class type in a member pointer to be an incomplete type.
- // In the Microsoft ABI, the size of the member pointer can vary
- // according to the class type, which means that we really need a
- // complete type if possible, which means we need to instantiate templates.
- //
- // If template instantiation fails or the type is just incomplete, we have to
- // add an extra slot to the member pointer. Yes, this does cause problems
- // when passing pointers between TUs that disagree about the size.
- if (Context.getTargetInfo().getCXXABI().isMicrosoft()) {
- CXXRecordDecl *RD = Class->getAsCXXRecordDecl();
- if (RD && !RD->hasAttr<MSInheritanceAttr>()) {
- // Lock in the inheritance model on the first use of a member pointer.
- // Otherwise we may disagree about the size at different points in the TU.
- // FIXME: MSVC picks a model on the first use that needs to know the size,
- // rather than on the first mention of the type, e.g. typedefs.
- if (RequireCompleteType(Loc, Class, 0) && !RD->isBeingDefined()) {
- // We know it doesn't have an attribute and it's incomplete, so use the
- // unspecified inheritance model. If we're in the record body, we can
- // figure out the inheritance model.
- for (CXXRecordDecl::redecl_iterator I = RD->redecls_begin(),
- E = RD->redecls_end(); I != E; ++I) {
- I->addAttr(::new (Context) MSInheritanceAttr(RD->getSourceRange(),
- Context,
- MSInheritanceAttr::UnspecifiedSpellingIndex));
- }
- }
- }
- }
-
// Adjust the default free function calling convention to the default method
// calling convention.
if (T->isFunctionType())
@@ -5094,6 +5065,21 @@
}
}
+ // We lock-in the inheritance model once somebody has asked us to ensure
+ // that a pointer-to-member type is complete.
+ if (Context.getTargetInfo().getCXXABI().isMicrosoft()) {
+ if (const MemberPointerType *MPTy = T->getAs<MemberPointerType>()) {
+ if (!MPTy->getClass()->isDependentType()) {
+ RequireCompleteType(Loc, QualType(MPTy->getClass(), 0), 0);
+
+ MPTy->getClass()
+ ->getAsCXXRecordDecl()
+ ->getMostRecentDecl()
+ ->setMSInheritanceModel();
+ }
+ }
+ }
+
return false;
}
Index: test/SemaCXX/microsoft-abi-ptm.cpp
===================================================================
--- /dev/null
+++ test/SemaCXX/microsoft-abi-ptm.cpp
@@ -0,0 +1,11 @@
+// RUN: %clang_cc1 -triple %ms_abi_triple -std=c++11 -fsyntax-only %s
+
+struct A;
+void f(int A::*mp);
+struct A { };
+static_assert(sizeof(int A::*) == sizeof(int), "pointer-to-member should be sizeof(int)");
+
+struct B;
+void f(int B::*mp);
+static_assert(sizeof(int B::*) == sizeof(int) * 3, "pointer-to-member should be sizeof(int) * 3");
+struct B { };
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
