Turn handling of parameter attributes back on, fixing the ObjC breakage

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47246 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 3 insertions, 2 deletions

diff --git a/Sema/SemaDecl.cpp b/Sema/SemaDecl.cpp
index 797efea7c5..9a19928ce7 100644
--- a/Sema/SemaDecl.cpp
+++ b/Sema/SemaDecl.cpp
@@ -987,8 +987,8 @@ Sema::ActOnParamDeclarator(struct DeclaratorChunk::ParamInfo &PI,
     II->setFETokenInfo(New);
     FnScope->AddDecl(New);
   }
-  // FIXME: Handle Attributes
-  //HandleDeclAttributes(New, PI.AttrList, 0);
+
+  HandleDeclAttributes(New, PI.AttrList, 0);
   return New;
 }
 
diff --git a/Sema/SemaDeclObjC.cpp b/Sema/SemaDeclObjC.cpp
index 8d5457154c..6b1d78bb77 100644
--- a/Sema/SemaDeclObjC.cpp
+++ b/Sema/SemaDeclObjC.cpp
@@ -42,6 +42,7 @@ void Sema::ObjCActOnStartOfMethodDef(Scope *FnBodyScope, DeclTy *D) {
   PI.Ident = &Context.Idents.get("self");
   PI.IdentLoc = SourceLocation(); // synthesized vars have a null location.
   PI.InvalidType = false;
+  PI.AttrList = 0;
   if (MDecl->isInstance()) {
     ObjCInterfaceDecl *OID = MDecl->getClassInterface();
     // There may be no interface context due to error in declaration of the