diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-01-17 16:13:22 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-01-17 16:13:22 +0000 |
| commit | 2dfe2bdba5bc7a7401e1023cd794ad362a24742d (patch) | |
| tree | c1ec2e295d941d47014bbc48e1f407f2911d45d4 /include | |
| parent | 27eb4d05f0800ec42f9723604969c27ef4296f41 (diff) | |
Merging r321777:
------------------------------------------------------------------------
r321777 | rsmith | 2018-01-03 17:02:18 -0800 (Wed, 03 Jan 2018) | 2 lines
PR35028: Retain duplicate alignas attributes in template instantiation.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_60@322676 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/clang/Basic/Attr.td | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td index 8b84c4b8b5..59f595e03c 100644 --- a/include/clang/Basic/Attr.td +++ b/include/clang/Basic/Attr.td @@ -549,6 +549,7 @@ def Aligned : InheritableAttr { Keyword<"_Alignas">]>, Accessor<"isDeclspec",[Declspec<"align">]>]; let Documentation = [Undocumented]; + let DuplicatesAllowedWhileMerging = 1; } def AlignValue : Attr { |