8 files changed, 47 insertions, 11 deletions

diff --git a/clang/include/clang/AST/Attr.h b/clang/include/clang/AST/Attr.h
index 37225907c6d..10999cb4675 100644
--- a/clang/include/clang/AST/Attr.h
+++ b/clang/include/clang/AST/Attr.h
@@ -62,7 +62,8 @@ public:
     FormatArg,
     GNUInline,
     Hiding,
-    IBOutletKind, // Clang-specific.  Use "Kind" suffix to not conflict with
+    IBOutletKind, // Clang-specific. Use "Kind" suffix to not conflict w/ macro.
+    IBActionKind, // Clang-specific. Use "Kind" suffix to not conflict w/ macro.
     Malloc,
     NoDebug,
     NoInline,
@@ -326,6 +327,19 @@ public:
   static bool classof(const IBOutletAttr *A) { return true; }
 };
 
+class IBActionAttr : public Attr {
+public:
+  IBActionAttr() : Attr(IBActionKind) {}
+
+  virtual Attr *clone(ASTContext &C) const;
+
+    // Implement isa/cast/dyncast/etc.
+  static bool classof(const Attr *A) {
+    return A->getKind() == IBActionKind;
+  }
+  static bool classof(const IBActionAttr *A) { return true; }
+};
+
 DEF_SIMPLE_ATTR(Malloc);
 DEF_SIMPLE_ATTR(NoReturn);
 DEF_SIMPLE_ATTR(AnalyzerNoReturn);
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index e2912ea3517..0ae68beac80 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -846,8 +846,8 @@ def err_attribute_regparm_invalid_number : Error<
 
 
 // Clang-Specific Attributes
-def err_attribute_iboutlet : Error<
-  "'iboutlet' attribute can only be applied to instance variables or "
+def err_attribute_ib : Error<
+  "%0 attribute can only be applied to instance variables or "
   "properties">;
 def err_attribute_overloadable_not_function : Error<
   "'overloadable' attribute can only be applied to a function">;
diff --git a/clang/include/clang/Parse/AttributeList.h b/clang/include/clang/Parse/AttributeList.h
index ecaa6aee470..eab773e412a 100644
--- a/clang/include/clang/Parse/AttributeList.h
+++ b/clang/include/clang/Parse/AttributeList.h
@@ -51,7 +51,8 @@ public:
                 AttributeList *Next, bool declspec = false, bool cxx0x = false);
   ~AttributeList();
 
-  enum Kind {              // Please keep this list alphabetized.
+  enum Kind {             // Please keep this list alphabetized.
+    AT_IBAction,          // Clang-specific.
     AT_IBOutlet,          // Clang-specific.
     AT_address_space,
     AT_alias,
diff --git a/clang/lib/AST/AttrImpl.cpp b/clang/lib/AST/AttrImpl.cpp
index d81979734b3..dd6e3564a50 100644
--- a/clang/lib/AST/AttrImpl.cpp
+++ b/clang/lib/AST/AttrImpl.cpp
@@ -139,6 +139,10 @@ Attr *IBOutletAttr::clone(ASTContext &C) const {
   return ::new (C) IBOutletAttr;
 }
 
+Attr *IBActionAttr::clone(ASTContext &C) const {
+  return ::new (C) IBActionAttr;
+}
+
 Attr *GNUInlineAttr::clone(ASTContext &C) const {
   return ::new (C) GNUInlineAttr;
 }
diff --git a/clang/lib/Frontend/PCHReaderDecl.cpp b/clang/lib/Frontend/PCHReaderDecl.cpp
index 625997cac23..f47a60f2607 100644
--- a/clang/lib/Frontend/PCHReaderDecl.cpp
+++ b/clang/lib/Frontend/PCHReaderDecl.cpp
@@ -517,6 +517,10 @@ Attr *PCHReader::ReadAttributes() {
     SIMPLE_ATTR(GNUInline);
     SIMPLE_ATTR(Hiding);
 
+    case Attr::IBActionKind:
+      New = ::new (*Context) IBActionAttr();
+      break;
+
     case Attr::IBOutletKind:
       New = ::new (*Context) IBOutletAttr();
       break;
diff --git a/clang/lib/Frontend/PCHWriter.cpp b/clang/lib/Frontend/PCHWriter.cpp
index 4c99dbe2450..bd6463128bc 100644
--- a/clang/lib/Frontend/PCHWriter.cpp
+++ b/clang/lib/Frontend/PCHWriter.cpp
@@ -1853,6 +1853,7 @@ void PCHWriter::WriteAttributeRecord(const Attr *Attr) {
     case Attr::GNUInline:
     case Attr::Hiding:
     case Attr::IBOutletKind:
+    case Attr::IBActionKind:
     case Attr::Malloc:
     case Attr::NoDebug:
     case Attr::NoReturn:
diff --git a/clang/lib/Parse/AttributeList.cpp b/clang/lib/Parse/AttributeList.cpp
index df48e3a7861..2321f1acb9d 100644
--- a/clang/lib/Parse/AttributeList.cpp
+++ b/clang/lib/Parse/AttributeList.cpp
@@ -82,6 +82,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) {
     .Case("stdcall", AT_stdcall)
     .Case("annotate", AT_annotate)
     .Case("fastcall", AT_fastcall)
+    .Case("ibaction", AT_IBAction)
     .Case("iboutlet", AT_IBOutlet)
     .Case("noreturn", AT_noreturn)
     .Case("noinline", AT_noinline)
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 02b2aa21b73..e0943274dac 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -225,19 +225,29 @@ static void HandlePackedAttr(Decl *d, const AttributeList &Attr, Sema &S) {
     S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName();
 }
 
-static void HandleIBOutletAttr(Decl *d, const AttributeList &Attr, Sema &S) {
+static void HandleIBAttr(Decl *d, const AttributeList &Attr, Sema &S) {
   // check the attribute arguments.
   if (Attr.getNumArgs() > 0) {
     S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0;
     return;
   }
 
-  // The IBOutlet attribute only applies to instance variables of Objective-C
-  // classes.
-  if (isa<ObjCIvarDecl>(d) || isa<ObjCPropertyDecl>(d))
-    d->addAttr(::new (S.Context) IBOutletAttr());
+  // The IBOutlet/IBAction attributes only apply to instance variables of
+  // Objective-C classes.
+  if (isa<ObjCIvarDecl>(d) || isa<ObjCPropertyDecl>(d)) {
+    switch (Attr.getKind()) {
+      case AttributeList::AT_IBAction:
+        d->addAttr(::new (S.Context) IBActionAttr());
+        break;
+      case AttributeList::AT_IBOutlet:
+        d->addAttr(::new (S.Context) IBOutletAttr());
+        break;
+      default:
+        llvm_unreachable("Invalid IB attribute");
+    }
+  }
   else
-    S.Diag(Attr.getLoc(), diag::err_attribute_iboutlet);
+    S.Diag(Attr.getLoc(), diag::err_attribute_ib) << Attr.getName();
 }
 
 static void HandleNonNullAttr(Decl *d, const AttributeList &Attr, Sema &S) {
@@ -1729,7 +1739,8 @@ static void ProcessDeclAttribute(Scope *scope, Decl *D,
     // FIXME: Try to deal with other __declspec attributes!
     return;
   switch (Attr.getKind()) {
-  case AttributeList::AT_IBOutlet:    HandleIBOutletAttr  (D, Attr, S); break;
+  case AttributeList::AT_IBAction:
+  case AttributeList::AT_IBOutlet:    HandleIBAttr          (D, Attr, S); break;
   case AttributeList::AT_address_space:
   case AttributeList::AT_objc_gc:
   case AttributeList::AT_vector_size: