diff --git a/include/clang/Basic/DiagnosticSemaKinds.def b/include/clang/Basic/DiagnosticSemaKinds.def
index 99b61cc..104371e 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.def
+++ b/include/clang/Basic/DiagnosticSemaKinds.def
@@ -946,7 +946,7 @@
      "no super class declared in @interface for %0")
 DIAG(err_invalid_receiver_to_message, ERROR,
      "invalid receiver to message expression")
-DIAG(error_bad_receiver_type, ERROR,
+DIAG(warn_bad_receiver_type, WARNING,
      "bad receiver type %0")
 DIAG(error_objc_throw_expects_object, ERROR,
      "invalid %0 argument (expected an ObjC object type)")
diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index 5be8460..f571068 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -464,7 +464,7 @@
     if (Method && DiagnoseUseOfDecl(Method, receiverLoc))
       return true;
   } else {
-    Diag(lbrac, diag::error_bad_receiver_type)
+    Diag(lbrac, diag::warn_bad_receiver_type)
       << RExpr->getType() << RExpr->getSourceRange();
     return true;
   }
diff --git a/test/SemaObjC/bad-receiver-1.m b/test/SemaObjC/bad-receiver-1.m
index 8376a5c..c9d2a2a 100644
--- a/test/SemaObjC/bad-receiver-1.m
+++ b/test/SemaObjC/bad-receiver-1.m
@@ -5,5 +5,13 @@
 @end
 
 void __raiseExc1() {
- [objc_lookUpClass("NSString") retain]; // expected-error {{ "bad receiver type 'int'" }}
+ [objc_lookUpClass("NSString") retain]; // expected-warning {{ "bad receiver type 'int'" }}
+}
+
+typedef const struct __CFString * CFStringRef;
+
+void func() {
+  CFStringRef obj;
+
+  [obj self]; // expected-warning {{bad receiver type 'CFStringRef' (aka 'struct __CFString const *')}}
 }
diff --git a/test/SemaObjC/super.m b/test/SemaObjC/super.m
index 243b84c..7a5cf9b 100644
--- a/test/SemaObjC/super.m
+++ b/test/SemaObjC/super.m
@@ -32,7 +32,7 @@
   [super m];
 }
 void f0(int super) {
-  [super m]; // expected-error{{bad receiver type 'int'}}
+  [super m]; // expected-warning{{bad receiver type 'int'}}
 }
 void f1(int puper) {
   [super m]; // expected-error{{use of undeclared identifier 'super'}}