diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-02-22 04:55:39 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-02-22 04:55:39 +0000 |
| commit | 671b3219c2be00ef8f26234ec993816c3ba56a4f (patch) | |
| tree | 9e1b879c18a31c7bd10d6f6e1d8653b21a437056 /lib/Sema/SemaDeclAttr.cpp | |
| parent | 1f12c47ae90c03633496d96e79a61762097a4681 (diff) | |
Implement C++11 [dcl.align]p6-p8, and C11 6.7.5/7. This had to be split out of
the normal attribute-merging path, because we can't merge alignment attributes
without knowing the complete set of alignment attributes which apply to a
particular declaration.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175861 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDeclAttr.cpp')
| -rw-r--r-- | lib/Sema/SemaDeclAttr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index e8c42e6f7c..0a30163f99 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -3368,8 +3368,7 @@ void Sema::AddAlignedAttr(SourceRange AttrRange, Decl *D, Expr *E, } if (DiagKind != -1) { Diag(AttrLoc, diag::err_alignas_attribute_wrong_decl_type) - << (TmpAttr.isC11() ? "'_Alignas'" : "'alignas'") - << DiagKind; + << TmpAttr.isC11() << DiagKind; return; } } |