git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR c++/50011 ([C++0x] warning: narrowing conversion of 'i' from 'short unsigned int' to 'int' inside { } [-Wnarrowing]) 

PR c++/50011
	* typeck2.c (check_narrowing): Fix integer logic.

From-SVN: r177565
This commit is contained in:
Jason Merrill 2011-08-08 10:36:22 -04:00 committed by Jason Merrill
parent cca2207a2d
commit d7cfa3145f
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-08 Jason Merrill <jason@redhat.com>
PR c++/50011
* typeck2.c (check_narrowing): Fix integer logic.
2011-08-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 2011-08-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* Make-lang.in (g++$(exeext)): Add $(EXTRA_GCC_LIBS). * Make-lang.in (g++$(exeext)): Add $(EXTRA_GCC_LIBS).

6
gcc/cp/typeck2.c
View File

@ -740,8 +740,10 @@ check_narrowing (tree type, tree init)
else if (INTEGRAL_OR_ENUMERATION_TYPE_P (ftype) else if (INTEGRAL_OR_ENUMERATION_TYPE_P (ftype)
&& CP_INTEGRAL_TYPE_P (type)) && CP_INTEGRAL_TYPE_P (type))
{ {
if ((TYPE_PRECISION (type) < TYPE_PRECISION (ftype) if ((tree_int_cst_lt (TYPE_MAX_VALUE (type),
|| TYPE_UNSIGNED (type) != TYPE_UNSIGNED (ftype)) TYPE_MAX_VALUE (ftype))
|| tree_int_cst_lt (TYPE_MIN_VALUE (ftype),
TYPE_MIN_VALUE (type)))
&& (TREE_CODE (init) != INTEGER_CST && (TREE_CODE (init) != INTEGER_CST
|| !int_fits_type_p (init, type))) || !int_fits_type_p (init, type)))
ok = false; ok = false;

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2011-08-08 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/initlist5.C: Add 50011 test.
2011-08-07 Janus Weil <janus@gcc.gnu.org> 2011-08-07 Janus Weil <janus@gcc.gnu.org>
PR fortran/49638 PR fortran/49638

4
gcc/testsuite/g++.dg/cpp0x/initlist5.C
View File

@ -29,3 +29,7 @@ float fa2[] = { d2, 1.1 };
// PR c++/49577 // PR c++/49577
unsigned u{ -1 }; // { dg-error "narrowing" } unsigned u{ -1 }; // { dg-error "narrowing" }
char c = char{ u }; // { dg-error "narrowing" } char c = char{ u }; // { dg-error "narrowing" }
// PR c++/50011
short unsigned su;
int i { su };