diff options
Diffstat (limited to 'clang/lib/Sema/SemaExpr.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index b22ae7d1f2b..e21047e10d8 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -1917,7 +1917,7 @@ Sema::CheckAssignmentConstraints(QualType lhsType, QualType rhsType) { if (rhsType->getAsBlockPointerType()) { if (lhsType->getAsPointerType()->getPointeeType()->isVoidType()) - return BlockVoidPointer; + return Compatible; // Treat block pointers as objects. if (getLangOptions().ObjC1 && @@ -1941,7 +1941,7 @@ Sema::CheckAssignmentConstraints(QualType lhsType, QualType rhsType) { if (const PointerType *RHSPT = rhsType->getAsPointerType()) { if (RHSPT->getPointeeType()->isVoidType()) - return BlockVoidPointer; + return Compatible; } return Incompatible; } @@ -1959,7 +1959,7 @@ Sema::CheckAssignmentConstraints(QualType lhsType, QualType rhsType) { if (isa<BlockPointerType>(lhsType) && rhsType->getAsPointerType()->getPointeeType()->isVoidType()) - return BlockVoidPointer; + return Compatible; return Incompatible; } @@ -3646,9 +3646,6 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy, case IncompatibleBlockPointer: DiagKind = diag::ext_typecheck_convert_incompatible_block_pointer; break; - case BlockVoidPointer: - DiagKind = diag::ext_typecheck_convert_pointer_void_block; - break; case IncompatibleObjCQualifiedId: // FIXME: Diagnose the problem in ObjCQualifiedIdTypesAreCompatible, since // it can give a more specific diagnostic. |
