From 73d3618223f2081eedcee2dbc4b6f89c4e942214 Mon Sep 17 00:00:00 2001 From: John McCall Date: Tue, 12 Oct 2010 07:14:40 +0000 Subject: C's comma operator performs lvalue conversion on both its operands; require them to have complete types. llvm-svn: 116297 --- clang/lib/Sema/SemaExpr.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'clang/lib/Sema/SemaExpr.cpp') diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 52ab62be020..514d9ba3f2f 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -6164,13 +6164,18 @@ QualType Sema::CheckAssignmentOperands(Expr *LHS, Expr *&RHS, QualType Sema::CheckCommaOperands(Expr *LHS, Expr *&RHS, SourceLocation Loc) { DiagnoseUnusedExprResult(LHS); - // Comma performs lvalue conversion (C99 6.3.2.1), but not unary conversions. - // C++ does not perform this conversion (C++ [expr.comma]p1). - if (!getLangOptions().CPlusPlus) - DefaultFunctionArrayLvalueConversion(RHS); + // C's comma performs lvalue conversion (C99 6.3.2.1) on both its + // operands, but not unary promotions. + // C++'s comma does not do any conversions at all (C++ [expr.comma]p1). + if (!getLangOptions().CPlusPlus) { + DefaultFunctionArrayLvalueConversion(LHS); + if (!LHS->getType()->isVoidType()) + RequireCompleteType(Loc, LHS->getType(), diag::err_incomplete_type); - // FIXME: Check that RHS type is complete in C mode (it's legal for it to be - // incomplete in C++). + DefaultFunctionArrayLvalueConversion(RHS); + if (!RHS->getType()->isVoidType()) + RequireCompleteType(Loc, RHS->getType(), diag::err_incomplete_type); + } return RHS->getType(); } -- cgit v1.2.3