diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2012-10-15 22:23:53 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2012-10-15 22:23:53 +0000 |
| commit | bd847cc5622cabc9abb1a59e950981cdf9418f96 (patch) | |
| tree | 9a6b39bba9153c91bf728efdaaa2006c5bf9dcdf /clang/lib/Sema | |
| parent | 345b09cb8064796467fae90c4b800923a461d308 (diff) | |
| download | bcm5719-llvm-bd847cc5622cabc9abb1a59e950981cdf9418f96.tar.gz bcm5719-llvm-bd847cc5622cabc9abb1a59e950981cdf9418f96.zip | |
Un-revert r164907 and r164902 (+ follow-ups), 10.6 build fix to follow.
llvm-svn: 165988
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 95c5290398d..3d66baa9259 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -9770,11 +9770,8 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy, switch (ConvTy) { case Compatible: - DiagnoseAssignmentEnum(DstType, SrcType, SrcExpr); - - // XXX here with forced compatible cast - - return false; + DiagnoseAssignmentEnum(DstType, SrcType, SrcExpr); + return false; case PointerToInt: DiagKind = diag::ext_typecheck_convert_pointer_int; @@ -9857,7 +9854,6 @@ 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; |
