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

re PR c++/39371 (Incorrectly rejects switch((unsigned int)boolvar))

Browse Source 
PR c++/39371
	* semantics.c (finish_switch_cond): Don't call get_unwidened.
	* decl.c (finish_case_label): Pass SWITCH_STMT_TYPE as 3rd argument
	instead of TREE_TYPE (cond).

	* g++.dg/opt/switch2.C: Add -w to dg-options.
	* g++.dg/warn/Wswitch-1.C: Adjust expected warnings.
	* g++.dg/warn/switch1.C: New test.
	* g++.dg/other/switch3.C: New test.

From-SVN: r144732
This commit is contained in:
Jakub Jelinek 2009-03-09 20:34:10 +01:00 committed by Jakub Jelinek
parent 9a9ba8d9b1
commit 8c30a5105f
8 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2009-03-09 Jakub Jelinek <jakub@redhat.com>
PR c++/39371
* semantics.c (finish_switch_cond): Don't call get_unwidened.
* decl.c (finish_case_label): Pass SWITCH_STMT_TYPE as 3rd argument
instead of TREE_TYPE (cond).
2009-03-08 H.J. Lu <hongjiu.lu@intel.com>
PR c++/39060

3
gcc/cp/decl.c
View File

@ -2806,7 +2806,8 @@ finish_case_label (tree low_value, tree high_value)
if (!check_switch_goto (switch_stack->level))
return error_mark_node;
r = c_add_case_label (switch_stack->cases, cond, TREE_TYPE (cond),
r = c_add_case_label (switch_stack->cases, cond,
SWITCH_STMT_TYPE (switch_stack->switch_stmt),
low_value, high_value);
/* After labels, make any new cleanups in the function go into their

14
gcc/cp/semantics.c
View File

@ -945,8 +945,6 @@ finish_switch_cond (tree cond, tree switch_stmt)
tree orig_type = NULL;
if (!processing_template_decl)
{
tree index;
/* Convert the condition to an integer or enumeration type. */
cond = build_expr_type_conversion (WANT_INT | WANT_ENUM, cond, true);
if (cond == NULL_TREE)
@ -963,18 +961,6 @@ finish_switch_cond (tree cond, tree switch_stmt)
cond = perform_integral_promotions (cond);
cond = maybe_cleanup_point_expr (cond);
}
if (cond != error_mark_node)
{
index = get_unwidened (cond, NULL_TREE);
/* We can't strip a conversion from a signed type to an unsigned,
because if we did, int_fits_type_p would do the wrong thing
when checking case values for being in range,
and it's too hard to do the right thing. */
if (TYPE_UNSIGNED (TREE_TYPE (cond))
== TYPE_UNSIGNED (TREE_TYPE (index)))
cond = index;
}
}
if (check_for_bare_parameter_packs (cond))
cond = error_mark_node;

6
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,11 @@
2009-03-09 Jakub Jelinek <jakub@redhat.com>
PR c++/39371
* g++.dg/opt/switch2.C: Add -w to dg-options.
* g++.dg/warn/Wswitch-1.C: Adjust expected warnings.
* g++.dg/warn/switch1.C: New test.
* g++.dg/other/switch3.C: New test.
PR tree-optimization/39394
* gcc.c-torture/compile/pr39394.c: New test.

2
gcc/testsuite/g++.dg/opt/switch2.C
View File

@ -1,5 +1,5 @@
// { dg-do compile }
// { dg-options "-O2" }
// { dg-options "-O2 -w" }
extern int foo (int);

25
gcc/testsuite/g++.dg/other/switch3.C Normal file
View File

@ -0,0 +1,25 @@
// PR c++/39371
// { dg-do compile }
void
foo (bool b)
{
switch ((unsigned int) b)
{
case 1:
case 2:
break;
}
}
void
bar (unsigned char b)
{
switch ((unsigned int) b)
{
case 1:
case 257:
case 513:
break;
}
}

6
gcc/testsuite/g++.dg/warn/Wswitch-1.C
View File

@ -50,14 +50,14 @@ foo (int i, int j, enum e ei, enum e ej, enum e ek, enum e el,
{
case e1: return 1;
case e2: return 2;
case 3: return 3; /* { dg-warning "case value '3' not in enumerated type 'e'" "excess 3" } */
case 3: return 3; /* { dg-warning "exceeds maximum value" } */
}
switch (ep)
{
case e1: return 1;
case e2: return 2;
case 3: return 3;
case 3: return 3; /* { dg-warning "exceeds maximum value" } */
default: break;
} /* Since there is a default, no warning about ``case 3'' */
}
return 0;
}

15
gcc/testsuite/g++.dg/warn/switch1.C Normal file
View File

@ -0,0 +1,15 @@
// { dg-do compile { target { int32plus } } }
signed char sc;
void
foo (void)
{
switch (sc)
{
case 1:
case 2 * __SCHAR_MAX__ + 3: // { dg-warning "case label value exceeds maximum" }
case - 2 * __SCHAR_MAX__ - 1: // { dg-warning "case label value is less than minimum" }
break;
}
}