diff options
| author | Manman Ren <manman.ren@gmail.com> | 2016-05-06 21:04:01 +0000 |
|---|---|---|
| committer | Manman Ren <manman.ren@gmail.com> | 2016-05-06 21:04:01 +0000 |
| commit | 719a864147e0fe6beb145424c8e9958a9ceb23d9 (patch) | |
| tree | db8aa5ddc61c0cd0bfbca1c110ae8544f436c50d /clang/lib/Sema/SemaDecl.cpp | |
| parent | 2b37017c38a4af183b4435bbec20c12b22537d26 (diff) | |
| download | bcm5719-llvm-719a864147e0fe6beb145424c8e9958a9ceb23d9.tar.gz bcm5719-llvm-719a864147e0fe6beb145424c8e9958a9ceb23d9.zip | |
Availability: set location when creating attribute for tvos, watchos.
When inferring availability attributes for tvos, watchos from ios, we
use the same source location and set the implicit bit to true.
So when emitting diagnostics on inferred attributes, we have a source
location.
rdar://25893544
llvm-svn: 268793
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 c979cd015c1..058a25bf452 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -2204,7 +2204,8 @@ static bool mergeDeclAttribute(Sema &S, NamedDecl *D, unsigned AttrSpellingListIndex = Attr->getSpellingListIndex(); if (const auto *AA = dyn_cast<AvailabilityAttr>(Attr)) NewAttr = S.mergeAvailabilityAttr(D, AA->getRange(), AA->getPlatform(), - AA->getIntroduced(), AA->getDeprecated(), + AA->isImplicit(), AA->getIntroduced(), + AA->getDeprecated(), AA->getObsoleted(), AA->getUnavailable(), AA->getMessage(), AA->getStrict(), AA->getReplacement(), AMK, |
