OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/50810 (c++0x-compat does not warn about narrowing conversions) 

/c-family
2011-10-23  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50810
	* c-opts.c (c_common_handle_option): Enable -Wnarrowing as part
	of -Wall; include -Wnarrowing in -Wc++0x-compat; adjust default
	Wnarrowing for C++0x and C++98.
	* c.opt ([Wnarrowing]): Update.

/cp
2011-10-23  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50810
	* typeck2.c (check_narrowing): Adjust OPT_Wnarrowing diagnostics.
	(digest_init_r): Call check_narrowing irrespective of the C++ dialect.
	* decl.c (check_initializer): Likewise.
	* semantics.c (finish_compound_literal): Likewise.

/testsuite
2011-10-23  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50810
	* g++.dg/cpp0x/warn_cxx0x2.C: New.
	* g++.dg/cpp0x/warn_cxx0x3.C: Likewise.

2011-10-23  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50810
	* doc/invoke.texi ([-Wnarrowing], [-Wc++0x-compat]): Update.

From-SVN: r180343
This commit is contained in:
Paolo Carlini 2011-10-23 18:34:45 +00:00 committed by Paolo Carlini
parent 19b6a33daa
commit 263734e172
12 changed files with 66 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2011-10-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50810
* doc/invoke.texi ([-Wnarrowing], [-Wc++0x-compat]): Update.
2011-10-23 Tom de Vries <tom@codesourcery.com>
PR tree-optimization/50763

8
gcc/c-family/ChangeLog
View File

@ -1,3 +1,11 @@
2011-10-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50810
* c-opts.c (c_common_handle_option): Enable -Wnarrowing as part
of -Wall; include -Wnarrowing in -Wc++0x-compat; adjust default
Wnarrowing for C++0x and C++98.
* c.opt ([Wnarrowing]): Update.
2011-10-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/45385

18
gcc/c-family/c-opts.c
View File

@ -406,6 +406,7 @@ c_common_handle_option (size_t scode, const char *arg, int value,
warn_reorder = value;
warn_cxx0x_compat = value;
warn_delnonvdtor = value;
warn_narrowing = value;
}
cpp_opts->warn_trigraphs = value;
@ -436,6 +437,10 @@ c_common_handle_option (size_t scode, const char *arg, int value,
cpp_opts->warn_cxx_operator_names = value;
break;
case OPT_Wc__0x_compat:
warn_narrowing = value;
break;
case OPT_Wdeprecated:
cpp_opts->cpp_warn_deprecated = value;
break;
@ -997,10 +1002,17 @@ c_common_post_options (const char **pfilename)
if (warn_implicit_function_declaration == -1)
warn_implicit_function_declaration = flag_isoc99;
/* If we're allowing C++0x constructs, don't warn about C++0x
compatibility problems. */
if (cxx_dialect == cxx0x)
warn_cxx0x_compat = 0;
{
/* If we're allowing C++0x constructs, don't warn about C++98
identifiers which are keywords in C++0x. */
warn_cxx0x_compat = 0;
if (warn_narrowing == -1)
warn_narrowing = 1;
}
else if (warn_narrowing == -1)
warn_narrowing = 0;
if (flag_preprocess_only)
{

4
gcc/c-family/c.opt
View File

@ -490,8 +490,8 @@ C ObjC C++ ObjC++ Warning
Warn about use of multi-character character constants
Wnarrowing
C ObjC C++ ObjC++ Warning Var(warn_narrowing) Init(1)
-Wno-narrowing In C++0x mode, ignore ill-formed narrowing conversions within { }
C ObjC C++ ObjC++ Warning Var(warn_narrowing) Init(-1) Warning
Warn about ill-formed narrowing conversions within { }
Wnested-externs
C ObjC Var(warn_nested_externs) Warning

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2011-10-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50810
* typeck2.c (check_narrowing): Adjust OPT_Wnarrowing diagnostics.
(digest_init_r): Call check_narrowing irrespective of the C++ dialect.
* decl.c (check_initializer): Likewise.
* semantics.c (finish_compound_literal): Likewise.
2011-10-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/45385

2
gcc/cp/decl.c
View File

@ -5523,7 +5523,7 @@ check_initializer (tree decl, tree init, int flags, tree *cleanup)
else
{
init = reshape_init (type, init, tf_warning_or_error);
if (cxx_dialect >= cxx0x && SCALAR_TYPE_P (type))
if (SCALAR_TYPE_P (type))
check_narrowing (type, init);
}
}

2
gcc/cp/semantics.c
View File

@ -2369,7 +2369,7 @@ finish_compound_literal (tree type, tree compound_literal,
&& check_array_initializer (NULL_TREE, type, compound_literal))
return error_mark_node;
compound_literal = reshape_init (type, compound_literal, complain);
if (cxx_dialect >= cxx0x && SCALAR_TYPE_P (type)
if (SCALAR_TYPE_P (type)
&& !BRACE_ENCLOSED_INITIALIZER_P (compound_literal))
check_narrowing (type, compound_literal);
if (TREE_CODE (type) == ARRAY_TYPE

8
gcc/cp/typeck2.c
View File

@ -803,8 +803,10 @@ check_narrowing (tree type, tree init)
}
if (!ok)
pedwarn (input_location, OPT_Wnarrowing, "narrowing conversion of %qE "
"from %qT to %qT inside { }", init, ftype, type);
emit_diagnostic ((cxx_dialect != cxx98) ? DK_PEDWARN : DK_WARNING,
input_location, OPT_Wnarrowing,
"narrowing conversion of %qE from %qT to %qT inside { }",
init, ftype, type);
}
/* Process the initializer INIT for a variable of type TYPE, emitting
@ -901,7 +903,7 @@ digest_init_r (tree type, tree init, bool nested, int flags,
{
tree *exp;
if (cxx_dialect != cxx98 && nested)
if (nested)
check_narrowing (type, init);
init = convert_for_initialization (0, type, init, flags,
ICR_INIT, NULL_TREE, 0,

12
gcc/doc/invoke.texi
View File

@ -2365,17 +2365,18 @@ an instance of a derived class through a pointer to a base class if the
base class does not have a virtual destructor. This warning is enabled
by @option{-Wall}.
@item -Wno-narrowing @r{(C++ and Objective-C++ only)}
@item -Wnarrowing @r{(C++ and Objective-C++ only)}
@opindex Wnarrowing
@opindex Wno-narrowing
With -std=c++0x, suppress the diagnostic required by the standard for
narrowing conversions within @samp{@{ @}}, e.g.
Warn when a narrowing conversion occurs within @samp{@{ @}}, e.g.
@smallexample
int i = @{ 2.2 @}; // error: narrowing from double to int
@end smallexample
This flag can be useful for compiling valid C++98 code in C++0x mode.
This flag is included in @option{-Wall} and @option{-Wc++0x-compat}.
With -std=c++0x, @option{-Wno-narrowing} suppresses the diagnostic
required by the standard.
@item -Wnoexcept @r{(C++ and Objective-C++ only)}
@opindex Wnoexcept
@ -4066,7 +4067,8 @@ ISO C and ISO C++, e.g.@: request for implicit conversion from
@item -Wc++0x-compat @r{(C++ and Objective-C++ only)}
Warn about C++ constructs whose meaning differs between ISO C++ 1998 and
ISO C++ 200x, e.g., identifiers in ISO C++ 1998 that will become keywords
in ISO C++ 200x. This warning is enabled by @option{-Wall}.
in ISO C++ 200x. This warning turns on @option{-Wnarrowing} and is
enabled by @option{-Wall}.
@item -Wcast-qual
@opindex Wcast-qual

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2011-10-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50810
* g++.dg/cpp0x/warn_cxx0x2.C: New.
* g++.dg/cpp0x/warn_cxx0x3.C: Likewise.
2011-10-23 Tom de Vries <tom@codesourcery.com>
PR tree-optimization/50763

4
gcc/testsuite/g++.dg/cpp0x/warn_cxx0x2.C Normal file
View File

@ -0,0 +1,4 @@
// PR c++/50810
// { dg-options "-std=gnu++98 -Wc++0x-compat" }
signed char data[] = { 0xff }; // { dg-warning "narrowing" }

4
gcc/testsuite/g++.dg/cpp0x/warn_cxx0x3.C Normal file
View File

@ -0,0 +1,4 @@
// PR c++/50810
// { dg-options "-std=gnu++98 -Wc++0x-compat -Wno-narrowing" }
signed char data[] = { 0xff };