diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-05-11 00:36:07 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-05-11 00:36:07 +0000 |
| commit | bf9da1f8292bb66720ada94a050ede9dca17f60a (patch) | |
| tree | 757f69354e83f6218807fe73995b622d07405946 /lib/Sema/SemaDecl.cpp | |
| parent | 7d9ae25d93554bdb238da83f9bb3e0b05475c16c (diff) | |
Fix a recent regression with the merging of format attributes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156597 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 691c27cc25..64caf2bacc 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -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); |