diff options
| -rw-r--r-- | lib/Sema/Sema.h | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 614e4873ba..57caa6ecf2 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -1166,10 +1166,6 @@ public: /// pointers types that are not compatible. IncompatibleBlockPointer, - /// BlockVoidPointer - The assignment is between a block pointer and - /// void*, we accept for now. - BlockVoidPointer, - /// IncompatibleObjCQualifiedId - The assignment is between a qualified /// id type and something else (that is incompatible with it). For example, /// "id <XXX>" = "Foo *", where "Foo *" doesn't implement the XXX protocol. diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index b22ae7d1f2..e21047e10d 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/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. |