diff options
Diffstat (limited to 'include/clang/Basic/Attr.td')
-rw-r--r-- | include/clang/Basic/Attr.td | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td index 31435485ef..9e23afcca3 100644 --- a/include/clang/Basic/Attr.td +++ b/include/clang/Basic/Attr.td @@ -1180,6 +1180,7 @@ def AssertExclusiveLock : InheritableAttr { let LateParsed = 1; let TemplateDependent = 1; let ParseArgumentsAsUnevaluated = 1; + let DuplicatesAllowedWhileMerging = 1; let Subjects = SubjectList<[FunctionDefinition, FunctionTemplate]>; } @@ -1189,6 +1190,7 @@ def AssertSharedLock : InheritableAttr { let LateParsed = 1; let TemplateDependent = 1; let ParseArgumentsAsUnevaluated = 1; + let DuplicatesAllowedWhileMerging = 1; let Subjects = SubjectList<[FunctionDefinition, FunctionTemplate]>; } |