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

Fix a recent regression with the merging of format attributes. 

llvm-svn: 156597
This commit is contained in:
Rafael Espindola 2012-05-11 00:36:07 +00:00
parent 60bb58f669
commit 92d49459ab
4 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1570,6 +1570,8 @@ public:
bool Inherited, VisibilityAttr::VisibilityType Vis);
bool mergeDLLImportAttr(Decl *D, SourceRange Range, bool Inherited);
bool mergeDLLExportAttr(Decl *D, SourceRange Range, bool Inherited);
bool mergeFormatAttr(Decl *D, SourceRange Range, bool Inherited,
StringRef Format, int FormatIdx, int FirstArg);
bool mergeDeclAttribute(Decl *New, InheritableAttr *Attr);
void mergeDeclAttributes(Decl *New, Decl *Old, bool MergeDeprecation = true);

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

@ -1674,6 +1674,10 @@ bool Sema::mergeDeclAttribute(Decl *D, InheritableAttr *Attr) {
if (DLLExportAttr *ExportA = dyn_cast<DLLExportAttr>(Attr))
return mergeDLLExportAttr(D, ExportA->getRange(), true);
if (FormatAttr *FA = dyn_cast<FormatAttr>(Attr))
return mergeFormatAttr(D, FA->getRange(), true, FA->getType(),
FA->getFormatIdx(), FA->getFirstArg());
if (!DeclHasAttr(D, Attr)) {
InheritableAttr *NewAttr = cast<InheritableAttr>(Attr->clone(Context));
NewAttr->setInherited(true);

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

@ -2535,6 +2535,31 @@ static void handleInitPriorityAttr(Sema &S, Decl *D,
prioritynum));
}
bool Sema::mergeFormatAttr(Decl *D, SourceRange Range, bool Inherited,
StringRef Format, int FormatIdx, int FirstArg) {
// Check whether we already have an equivalent format attribute.
for (specific_attr_iterator<FormatAttr>
i = D->specific_attr_begin<FormatAttr>(),
e = D->specific_attr_end<FormatAttr>();
i != e ; ++i) {
FormatAttr *f = *i;
if (f->getType() == Format &&
f->getFormatIdx() == FormatIdx &&
f->getFirstArg() == FirstArg) {
// If we don't have a valid location for this attribute, adopt the
// location.
if (f->getLocation().isInvalid())
f->setRange(Range);
return false;
}
}
FormatAttr *Attr = ::new (Context) FormatAttr(Range, Context, Format,
FormatIdx, FirstArg);
D->addAttr(Attr);
return true;
}
/// Handle __attribute__((format(type,idx,firstarg))) attributes based on
/// http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
static void handleFormatAttr(Sema &S, Decl *D, const AttributeList &Attr) {
@ -2670,26 +2695,8 @@ static void handleFormatAttr(Sema &S, Decl *D, const AttributeList &Attr) {
return;
}
// Check whether we already have an equivalent format attribute.
for (specific_attr_iterator<FormatAttr>
i = D->specific_attr_begin<FormatAttr>(),
e = D->specific_attr_end<FormatAttr>();
i != e ; ++i) {
FormatAttr *f = *i;
if (f->getType() == Format &&
f->getFormatIdx() == (int)Idx.getZExtValue() &&
f->getFirstArg() == (int)FirstArg.getZExtValue()) {
// If we don't have a valid location for this attribute, adopt the
// location.
if (f->getLocation().isInvalid())
f->setRange(Attr.getRange());
return;
}
}
D->addAttr(::new (S.Context) FormatAttr(Attr.getRange(), S.Context, Format,
Idx.getZExtValue(),
FirstArg.getZExtValue()));
S.mergeFormatAttr(D, Attr.getRange(), false, Format, Idx.getZExtValue(),
FirstArg.getZExtValue());
}
static void handleTransparentUnionAttr(Sema &S, Decl *D,

17
clang/test/Sema/format-strings.c
View File

@ -536,3 +536,20 @@ void pr12761(char c) {
// This should not warn even with -fno-signed-char.
printf("%hhx", c);
}
// Test that we correctly merge the format in both orders.
extern void test14_foo(const char *, const char *, ...)
__attribute__((__format__(__printf__, 1, 3)));
extern void test14_foo(const char *, const char *, ...)
__attribute__((__format__(__scanf__, 2, 3)));
extern void test14_bar(const char *, const char *, ...)
__attribute__((__format__(__scanf__, 2, 3)));
extern void test14_bar(const char *, const char *, ...)
__attribute__((__format__(__printf__, 1, 3)));
void test14_zed(int *p) {
test14_foo("%", "%d", p); // expected-warning{{incomplete format specifier}}
test14_bar("%", "%d", p); // expected-warning{{incomplete format specifier}}
}