diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-01-08 22:31:36 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-01-08 22:31:36 +0000 |
| commit | d130fd2e141f1fef412c2d58e7385370801bd718 (patch) | |
| tree | a3bee60e5f300dec0f3fe7c1fd89e669250b51cc | |
| parent | 51be6e3487c4b7f43d9f5b2db962382b79295acb (diff) | |
Clear LV cache when dropping availability attributes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@171906 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaDeclAttr.cpp | 6 | ||||
| -rw-r--r-- | test/Sema/attr-availability.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index a13da7c941..225ee24d0f 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -2043,6 +2043,7 @@ AvailabilityAttr *Sema::mergeAvailabilityAttr(NamedDecl *D, SourceRange Range, VersionTuple MergedDeprecated = Deprecated; VersionTuple MergedObsoleted = Obsoleted; bool FoundAny = false; + bool DroppedAny = false; if (D->hasAttrs()) { AttrVec &Attrs = D->getAttrs(); @@ -2077,6 +2078,7 @@ AvailabilityAttr *Sema::mergeAvailabilityAttr(NamedDecl *D, SourceRange Range, Diag(OldAA->getLocation(), diag::warn_mismatched_availability); Diag(Range.getBegin(), diag::note_previous_attribute); Attrs.erase(Attrs.begin() + i); + DroppedAny = true; --e; continue; } @@ -2096,6 +2098,7 @@ AvailabilityAttr *Sema::mergeAvailabilityAttr(NamedDecl *D, SourceRange Range, MergedIntroduced2, MergedDeprecated2, MergedObsoleted2)) { Attrs.erase(Attrs.begin() + i); + DroppedAny = true; --e; continue; } @@ -2107,6 +2110,9 @@ AvailabilityAttr *Sema::mergeAvailabilityAttr(NamedDecl *D, SourceRange Range, } } + if (DroppedAny) + D->ClearLVCache(); + if (FoundAny && MergedIntroduced == Introduced && MergedDeprecated == Deprecated && diff --git a/test/Sema/attr-availability.c b/test/Sema/attr-availability.c index 805aef804b..ac6a187591 100644 --- a/test/Sema/attr-availability.c +++ b/test/Sema/attr-availability.c @@ -51,3 +51,6 @@ void f8() { int (^b)(int); b = ^ (int i) __attribute__((availability(macosx,introduced=10.2))) { return 1; }; // expected-warning {{'availability' attribute ignored}} } + +extern int x2 __attribute__((availability(macosx,introduced=10.2))); // expected-note {{previous attribute is here}} +extern int x2 __attribute__((availability(macosx,introduced=10.5))); // expected-warning {{availability does not match previous declaration}} |