1 files changed, 2 insertions, 8 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 93f97f66ee..a7bd46a2ca 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -8045,14 +8045,8 @@ VarDecl *Sema::BuildExceptionDeclaration(Scope *S,
       Diag(Loc, diag::err_objc_object_catch);
       Invalid = true;
     } else if (T->isObjCObjectPointerType()) {
-      if (!getLangOptions().ObjCNonFragileABI) {
-        if (T->isObjCIdType() || T->isObjCQualifiedIdType())
-          Diag(Loc, diag::warn_objc_pointer_cxx_catch_fragile);
-        else {
-          Diag(Loc, diag::err_objc_pointer_cxx_catch_fragile);
-          Invalid = true;
-        }
-      }
+      if (!getLangOptions().ObjCNonFragileABI)
+        Diag(Loc, diag::warn_objc_pointer_cxx_catch_fragile);
     }
   }