From bec2bf132628869402899a10c086a0759025ee08 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 15 Oct 2012 20:37:01 +0000 Subject: Revert r164907 and r164902 (+ follow-ups). They broke building on 10.6. See PR14013. llvm-svn: 165962 --- clang/lib/Sema/SemaExpr.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'clang/lib/Sema/SemaExpr.cpp') diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 3d66baa9259..95c5290398d 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -9770,8 +9770,11 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy, switch (ConvTy) { case Compatible: - DiagnoseAssignmentEnum(DstType, SrcType, SrcExpr); - return false; + DiagnoseAssignmentEnum(DstType, SrcType, SrcExpr); + + // XXX here with forced compatible cast + + return false; case PointerToInt: DiagKind = diag::ext_typecheck_convert_pointer_int; @@ -9854,6 +9857,7 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy, DiagKind = diag::err_arc_weak_unavailable_assign; break; case Incompatible: + // XXX here DiagKind = diag::err_typecheck_convert_incompatible; ConvHints.tryToFixConversion(SrcExpr, SrcType, DstType, *this); MayHaveConvFixit = true; -- cgit v1.2.3