maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Clear the LV cache when merging the availability attribute. 

The availability implies default visibility, so it can change the computed
visibility.

llvm-svn: 171840
This commit is contained in:
Rafael Espindola 2013-01-08 04:04:30 +00:00
parent 95de6bd469
commit 9a5a6dddf9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Sema/SemaDecl.cpp
View File

@ -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);

3
clang/test/Sema/attr-availability.c
View File

@ -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;