From ec3fba517279402b4686129c23af1d34f23b5ce0 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Thu, 30 Apr 2015 13:35:44 +0000 Subject: c-typeck.c (c_build_va_arg): Clarify the error message. * c-typeck.c (c_build_va_arg): Clarify the error message. * gcc.dg/pr65901.c (foo): Adjust dg-error. * gcc.c-torture/compile/pr48767.c (foo): Likewise. From-SVN: r222626 --- gcc/c/ChangeLog | 2 ++ gcc/c/c-typeck.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'gcc/c') diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 3894bb9..2ef895a 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -6,6 +6,8 @@ * c-typeck.c (c_incomplete_type_error): Refactor to use %qT. Print the type of a decl. + * c-typeck.c (c_build_va_arg): Clarify the error message. + 2015-04-29 Thomas Schwinge * c-parser.c (c_parser_oacc_enter_exit_data): Use diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 413cd07..328f294 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -12635,14 +12635,17 @@ c_build_qualified_type (tree type, int type_quals) tree c_build_va_arg (location_t loc, tree expr, tree type) { - if (warn_cxx_compat && TREE_CODE (type) == ENUMERAL_TYPE) - warning_at (loc, OPT_Wc___compat, - "C++ requires promoted type, not enum type, in %"); - if (type == error_mark_node || !COMPLETE_TYPE_P (type)) + if (error_operand_p (type)) + return error_mark_node; + else if (!COMPLETE_TYPE_P (type)) { - c_incomplete_type_error (NULL_TREE, type); + error_at (loc, "second argument to % is of incomplete " + "type %qT", type); return error_mark_node; } + else if (warn_cxx_compat && TREE_CODE (type) == ENUMERAL_TYPE) + warning_at (loc, OPT_Wc___compat, + "C++ requires promoted type, not enum type, in %"); return build_va_arg (loc, expr, type); } -- cgit v1.1