From 4cc4f2f437f583f78c3bae594bb019b7a767eb13 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 27 May 2011 21:19:36 +0200 Subject: [PATCH] re PR c++/49165 (ICE on for-loop/throw combination) PR c++/49165 * c-common.c (c_common_truthvalue_conversion) : For C++ don't call c_common_truthvalue_conversion on void type arms. * g++.dg/eh/cond6.C: New test. From-SVN: r174350 --- gcc/c-family/ChangeLog | 6 +++++ gcc/c-family/c-common.c | 15 ++++++------ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/g++.dg/eh/cond6.C | 43 +++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/g++.dg/eh/cond6.C diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 557f89634e9..3bdfbab007c 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2011-05-27 Jakub Jelinek + + PR c++/49165 + * c-common.c (c_common_truthvalue_conversion) : For + C++ don't call c_common_truthvalue_conversion on void type arms. + 2011-05-27 Nathan Froyd * c-common.h (struct stmt_tree_s) [x_cur_stmt_list]: Change to a VEC. diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index fa7ebc5d30d..dbef4b314ea 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -3945,14 +3945,15 @@ c_common_truthvalue_conversion (location_t location, tree expr) /* Distribute the conversion into the arms of a COND_EXPR. */ if (c_dialect_cxx ()) { + tree op1 = TREE_OPERAND (expr, 1); + tree op2 = TREE_OPERAND (expr, 2); + /* In C++ one of the arms might have void type if it is throw. */ + if (!VOID_TYPE_P (TREE_TYPE (op1))) + op1 = c_common_truthvalue_conversion (location, op1); + if (!VOID_TYPE_P (TREE_TYPE (op2))) + op2 = c_common_truthvalue_conversion (location, op2); expr = fold_build3_loc (location, COND_EXPR, truthvalue_type_node, - TREE_OPERAND (expr, 0), - c_common_truthvalue_conversion (location, - TREE_OPERAND (expr, - 1)), - c_common_truthvalue_conversion (location, - TREE_OPERAND (expr, - 2))); + TREE_OPERAND (expr, 0), op1, op2); goto ret; } else diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bb23b71195f..141714250d8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-05-27 Jakub Jelinek + + PR c++/49165 + * g++.dg/eh/cond6.C: New test. + 2011-05-27 Tobias Burnus PR fortran/48820 diff --git a/gcc/testsuite/g++.dg/eh/cond6.C b/gcc/testsuite/g++.dg/eh/cond6.C new file mode 100644 index 00000000000..1eed63ec84f --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/cond6.C @@ -0,0 +1,43 @@ +// PR c++/49165 +// { dg-do run } + +extern "C" void abort (); + +int +foo (bool x, int y) +{ + if (y < 10 && (x ? 1 : throw 1)) + y++; + if (y > 20 || (x ? 1 : throw 2)) + y++; + return y; +} + +int +main () +{ + if (foo (true, 0) != 2 + || foo (true, 10) != 11 + || foo (false, 30) != 31) + abort (); + try + { + foo (false, 0); + abort (); + } + catch (int i) + { + if (i != 1) + abort (); + } + try + { + foo (false, 10); + abort (); + } + catch (int i) + { + if (i != 2) + abort (); + } +} -- 2.30.2