diff options
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 8 | ||||
| -rw-r--r-- | test/Sema/attr-availability.c | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 84b0d3f36b..3b37890f21 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -1790,12 +1790,16 @@ DeclHasAttr(const Decl *D, const Attr *A) { bool Sema::mergeDeclAttribute(Decl *D, InheritableAttr *Attr) { InheritableAttr *NewAttr = NULL; - if (AvailabilityAttr *AA = dyn_cast<AvailabilityAttr>(Attr)) + if (AvailabilityAttr *AA = dyn_cast<AvailabilityAttr>(Attr)) { NewAttr = mergeAvailabilityAttr(D, AA->getRange(), AA->getPlatform(), AA->getIntroduced(), AA->getDeprecated(), AA->getObsoleted(), AA->getUnavailable(), AA->getMessage()); - else if (VisibilityAttr *VA = dyn_cast<VisibilityAttr>(Attr)) { + if (NewAttr) { + NamedDecl *ND = cast<NamedDecl>(D); + ND->ClearLVCache(); + } + } else if (VisibilityAttr *VA = dyn_cast<VisibilityAttr>(Attr)) { NewAttr = mergeVisibilityAttr(D, VA->getRange(), VA->getVisibility()); if (NewAttr) { NamedDecl *ND = cast<NamedDecl>(D); diff --git a/test/Sema/attr-availability.c b/test/Sema/attr-availability.c index e0c541e8d8..1d4b0efed6 100644 --- a/test/Sema/attr-availability.c +++ b/test/Sema/attr-availability.c @@ -43,3 +43,6 @@ void f7(int) __attribute__((availability(ios,deprecated=4.0))); // expected-warn #if !__has_feature(attribute_availability_with_message) # error "Missing __has_feature" #endif + +extern int x __attribute__((availability(macosx,introduced=10.5))); +extern int x; |