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 | 92d49459ab259886dd524f0acfcfeb38720d8148 (patch) | |
| tree | dc69b970e9d4489ea90fffd2a2461e239caaacd8 /clang/lib/Sema/SemaDecl.cpp | |
| parent | 60bb58f669c3f34515da9072da06fc2ce8db9dc7 (diff) | |
| download | bcm5719-llvm-92d49459ab259886dd524f0acfcfeb38720d8148.tar.gz bcm5719-llvm-92d49459ab259886dd524f0acfcfeb38720d8148.zip | |
Fix a recent regression with the merging of format attributes.
llvm-svn: 156597
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 691c27cc259..64caf2bacc9 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/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); |
