Author: d0k Date: Fri Jan 26 12:01:13 2018 New Revision: 323554 URL: http://llvm.org/viewvc/llvm-project?rev=323554&view=rev Log: Try to unbreak 32 bit builds after r323528.
Modified: cfe/trunk/include/clang/AST/Decl.h Modified: cfe/trunk/include/clang/AST/Decl.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=323554&r1=323553&r2=323554&view=diff ============================================================================== --- cfe/trunk/include/clang/AST/Decl.h (original) +++ cfe/trunk/include/clang/AST/Decl.h Fri Jan 26 12:01:13 2018 @@ -83,7 +83,7 @@ class VarTemplateDecl; /// TypeLoc TL = TypeSourceInfo->getTypeLoc(); /// TL.getStartLoc().print(OS, SrcMgr); /// @endcode -class TypeSourceInfo { +class LLVM_ALIGNAS(8) TypeSourceInfo { // Contains a memory block after the class, used for type source information, // allocated by ASTContext. friend class ASTContext; @@ -2813,7 +2813,10 @@ public: /// Base class for declarations which introduce a typedef-name. class TypedefNameDecl : public TypeDecl, public Redeclarable<TypedefNameDecl> { - using ModedTInfo = std::pair<TypeSourceInfo *, QualType>; + struct LLVM_ALIGNAS(8) ModedTInfo { + TypeSourceInfo *first; + QualType second; + }; /// If int part is 0, we have not computed IsTransparentTag. /// Otherwise, IsTransparentTag is (getInt() >> 1). @@ -2877,7 +2880,7 @@ public: void setModedTypeSourceInfo(TypeSourceInfo *unmodedTSI, QualType modedTy) { MaybeModedTInfo.setPointer(new (getASTContext(), 8) - ModedTInfo(unmodedTSI, modedTy)); + ModedTInfo({unmodedTSI, modedTy})); } /// Retrieves the canonical declaration of this typedef-name. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits