diff options
| author | Manman Ren <manman.ren@gmail.com> | 2016-03-21 17:30:55 +0000 |
|---|---|---|
| committer | Manman Ren <manman.ren@gmail.com> | 2016-03-21 17:30:55 +0000 |
| commit | 75bc676160c00f73cfdf0b5577b4e57196861bf9 (patch) | |
| tree | f0980797a18ffcc57e70950a697a6749815d9748 /clang/lib/Sema/SemaDecl.cpp | |
| parent | 930de67e6a78a2461d21d43a84666293bc0197ed (diff) | |
| download | bcm5719-llvm-75bc676160c00f73cfdf0b5577b4e57196861bf9.tar.gz bcm5719-llvm-75bc676160c00f73cfdf0b5577b4e57196861bf9.zip | |
Add replacement = "xxx" to AvailabilityAttr.
This commit adds a named argument to AvailabilityAttr, while r263652 adds an
optional string argument to __attribute__((deprecated)).
This was commited in r263687 and reverted in 263752 due to misaligned
access.
rdar://20588929
llvm-svn: 263958
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 6b1182fa4cb..321f1006bf8 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -2196,7 +2196,8 @@ static bool mergeDeclAttribute(Sema &S, NamedDecl *D, NewAttr = S.mergeAvailabilityAttr(D, AA->getRange(), AA->getPlatform(), AA->getIntroduced(), AA->getDeprecated(), AA->getObsoleted(), AA->getUnavailable(), - AA->getMessage(), AA->getStrict(), AMK, + AA->getMessage(), AA->getStrict(), + AA->getReplacement(), AMK, AttrSpellingListIndex); else if (const auto *VA = dyn_cast<VisibilityAttr>(Attr)) NewAttr = S.mergeVisibilityAttr(D, VA->getRange(), VA->getVisibility(), |
