From: Richard Smith Date: Tue, 17 Jul 2018 22:24:11 +0000 (+0000) Subject: Replace LLVM_ALIGNAS with just alignas. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed683dcc4ef0546d1e6c04337222d90bac7b785c;p=clang Replace LLVM_ALIGNAS with just alignas. Various places in Clang and LLVM are already using alignas; it seems our minimum host configuration now requires it. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@337330 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index e419ded280..a0986085a1 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -83,7 +83,7 @@ class VarTemplateDecl; /// TypeLoc TL = TypeSourceInfo->getTypeLoc(); /// TL.getStartLoc().print(OS, SrcMgr); /// @endcode -class LLVM_ALIGNAS(8) TypeSourceInfo { +class alignas(8) TypeSourceInfo { // Contains a memory block after the class, used for type source information, // allocated by ASTContext. friend class ASTContext; @@ -2860,7 +2860,7 @@ public: /// Base class for declarations which introduce a typedef-name. class TypedefNameDecl : public TypeDecl, public Redeclarable { - struct LLVM_ALIGNAS(8) ModedTInfo { + struct alignas(8) ModedTInfo { TypeSourceInfo *first; QualType second; }; diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h index 5ca5907832..f99bd62787 100644 --- a/include/clang/AST/DeclBase.h +++ b/include/clang/AST/DeclBase.h @@ -83,7 +83,7 @@ enum AvailabilityResult { /// (and its subclasses) in its Decl::operator new(). Proper alignment /// of all subclasses (not requiring more than the alignment of Decl) is /// asserted in DeclBase.cpp. -class LLVM_ALIGNAS(/*alignof(uint64_t)*/ 8) Decl { +class alignas(8) Decl { public: /// Lists the kind of concrete classes of Decl. enum Kind { diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h index 9e024c12ff..cbdbc529f7 100644 --- a/include/clang/AST/Type.h +++ b/include/clang/AST/Type.h @@ -4644,7 +4644,7 @@ public: /// TemplateArguments, followed by a QualType representing the /// non-canonical aliased type when the template is a type alias /// template. -class LLVM_ALIGNAS(/*alignof(uint64_t)*/ 8) TemplateSpecializationType +class alignas(8) TemplateSpecializationType : public Type, public llvm::FoldingSetNode { friend class ASTContext; // ASTContext creates these @@ -5062,7 +5062,7 @@ public: /// Represents a template specialization type whose template cannot be /// resolved, e.g. /// A::template B -class LLVM_ALIGNAS(/*alignof(uint64_t)*/ 8) DependentTemplateSpecializationType +class alignas(8) DependentTemplateSpecializationType : public TypeWithKeyword, public llvm::FoldingSetNode { friend class ASTContext; // ASTContext creates these diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h index 33e63d9d40..99c36f4cdf 100644 --- a/include/clang/Basic/SourceManager.h +++ b/include/clang/Basic/SourceManager.h @@ -92,7 +92,7 @@ namespace SrcMgr { /// One instance of this struct is kept for every file loaded or used. /// /// This object owns the MemoryBuffer object. - class LLVM_ALIGNAS(8) ContentCache { + class alignas(8) ContentCache { enum CCFlags { /// Whether the buffer is invalid. InvalidFlag = 0x01, diff --git a/lib/CodeGen/CGCleanup.h b/lib/CodeGen/CGCleanup.h index 5530350b9b..93be3e6c15 100644 --- a/lib/CodeGen/CGCleanup.h +++ b/lib/CodeGen/CGCleanup.h @@ -230,7 +230,7 @@ public: }; /// A cleanup scope which generates the cleanup blocks lazily. -class LLVM_ALIGNAS(/*alignof(uint64_t)*/ 8) EHCleanupScope : public EHScope { +class alignas(8) EHCleanupScope : public EHScope { /// The nearest normal cleanup scope enclosing this one. EHScopeStack::stable_iterator EnclosingNormal;