commit 92d49459ab259886dd524f0acfcfeb38720d8148
author Rafael Espindola <rafael.espindola@gmail.com> Fri May 11 00:36:07 2012 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri May 11 00:36:07 2012 +0000
tree dc69b970e9d4489ea90fffd2a2461e239caaacd8
parent 60bb58f669c3f34515da9072da06fc2ce8db9dc7

Fix a recent regression with the merging of format attributes.

llvm-svn: 156597

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 691c27c..64caf2b 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -1674,6 +1674,10 @@
   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);