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

Tighten types a bit. No functionality change. 

llvm-svn: 171902
This commit is contained in:
Rafael Espindola 2013-01-08 22:04:34 +00:00
parent b65d733f06
commit a3aea433f8
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/include/clang/Sema/Sema.h
View File

@ -1669,7 +1669,7 @@ public:
bool isIncompatibleTypedef(TypeDecl *Old, TypedefNameDecl *New);
/// Attribute merging methods. Return true if a new attribute was added.
AvailabilityAttr *mergeAvailabilityAttr(Decl *D, SourceRange Range,
AvailabilityAttr *mergeAvailabilityAttr(NamedDecl *D, SourceRange Range,
IdentifierInfo *Platform,
VersionTuple Introduced,
VersionTuple Deprecated,
@ -1683,9 +1683,10 @@ public:
FormatAttr *mergeFormatAttr(Decl *D, SourceRange Range, StringRef Format,
int FormatIdx, int FirstArg);
SectionAttr *mergeSectionAttr(Decl *D, SourceRange Range, StringRef Name);
bool mergeDeclAttribute(Decl *New, InheritableAttr *Attr);
bool mergeDeclAttribute(NamedDecl *New, InheritableAttr *Attr);
void mergeDeclAttributes(Decl *New, Decl *Old, bool MergeDeprecation = true);
void mergeDeclAttributes(NamedDecl *New, Decl *Old,
bool MergeDeprecation = true);
void MergeTypedefNameDecl(TypedefNameDecl *New, LookupResult &OldDecls);
bool MergeFunctionDecl(FunctionDecl *New, Decl *Old, Scope *S);
bool MergeCompatibleFunctionDecls(FunctionDecl *New, FunctionDecl *Old,

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

@ -1788,23 +1788,19 @@ DeclHasAttr(const Decl *D, const Attr *A) {
return false;
}
bool Sema::mergeDeclAttribute(Decl *D, InheritableAttr *Attr) {
bool Sema::mergeDeclAttribute(NamedDecl *D, InheritableAttr *Attr) {
InheritableAttr *NewAttr = NULL;
if (AvailabilityAttr *AA = dyn_cast<AvailabilityAttr>(Attr)) {
NewAttr = mergeAvailabilityAttr(D, AA->getRange(), AA->getPlatform(),
AA->getIntroduced(), AA->getDeprecated(),
AA->getObsoleted(), AA->getUnavailable(),
AA->getMessage());
if (NewAttr) {
NamedDecl *ND = cast<NamedDecl>(D);
ND->ClearLVCache();
}
if (NewAttr)
D->ClearLVCache();
} else if (VisibilityAttr *VA = dyn_cast<VisibilityAttr>(Attr)) {
NewAttr = mergeVisibilityAttr(D, VA->getRange(), VA->getVisibility());
if (NewAttr) {
NamedDecl *ND = cast<NamedDecl>(D);
ND->ClearLVCache();
}
if (NewAttr)
D->ClearLVCache();
} else if (DLLImportAttr *ImportA = dyn_cast<DLLImportAttr>(Attr))
NewAttr = mergeDLLImportAttr(D, ImportA->getRange());
else if (DLLExportAttr *ExportA = dyn_cast<DLLExportAttr>(Attr))
@ -1875,7 +1871,7 @@ static void checkNewAttributesAfterDef(Sema &S, Decl *New, const Decl *Old) {
}
/// mergeDeclAttributes - Copy attributes from the Old decl to the New one.
void Sema::mergeDeclAttributes(Decl *New, Decl *Old,
void Sema::mergeDeclAttributes(NamedDecl *New, Decl *Old,
bool MergeDeprecation) {
// attributes declared post-definition are currently ignored
checkNewAttributesAfterDef(*this, New, Old);

4
clang/lib/Sema/SemaDeclAttr.cpp
View File

@ -2032,7 +2032,7 @@ static bool checkAvailabilityAttr(Sema &S, SourceRange Range,
return false;
}
AvailabilityAttr *Sema::mergeAvailabilityAttr(Decl *D, SourceRange Range,
AvailabilityAttr *Sema::mergeAvailabilityAttr(NamedDecl *D, SourceRange Range,
IdentifierInfo *Platform,
VersionTuple Introduced,
VersionTuple Deprecated,
@ -2147,7 +2147,7 @@ static void handleAvailabilityAttr(Sema &S, Decl *D,
if (SE)
Str = SE->getString();
AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(D, Attr.getRange(),
AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(ND, Attr.getRange(),
Platform,
Introduced.Version,
Deprecated.Version,