commit d331e75761638e0fdb33d3531acc45988a60e8f1
author Mike Stump <mrs@apple.com> Tue Apr 21 22:51:42 2009 +0000
committer Mike Stump <mrs@apple.com> Tue Apr 21 22:51:42 2009 +0000
tree 2ee43ba1a3a40a8db600b7cdf736c7c0cabca231
parent bb5c707bcc029176e75a618986cb501ca5ad8fea

Tighten up blocks type checking.  This was discussed back in the
r56595 timeframe, but left undone.  Radar 6812711


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

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index fa85757..81bac66 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -4894,7 +4894,7 @@
     DiagKind = diag::err_int_to_block_pointer;
     break;
   case IncompatibleBlockPointer:
-    DiagKind = diag::ext_typecheck_convert_incompatible_block_pointer;
+    DiagKind = diag::err_typecheck_convert_incompatible_block_pointer;
     break;
   case IncompatibleObjCQualifiedId:
     // FIXME: Diagnose the problem in ObjCQualifiedIdTypesAreCompatible, since