diff options
| author | Mikhail Maltsev <maltsevm@gmail.com> | 2015-06-20 00:10:00 +0000 |
|---|---|---|
| committer | Mikhail Maltsev <miyuki@gcc.gnu.org> | 2015-06-20 00:10:00 +0000 |
| commit | cd95a0d559e691d3767b238f1a584d006dcbb53e (patch) | |
| tree | 75f21c3e10ed2e8aeffd8082e824e1d3105da9e3 /gcc/cp | |
| parent | 3cad5f64a81355feef936483251875ab9a7900a6 (diff) | |
| download | gcc-cd95a0d559e691d3767b238f1a584d006dcbb53e.zip gcc-cd95a0d559e691d3767b238f1a584d006dcbb53e.tar.gz gcc-cd95a0d559e691d3767b238f1a584d006dcbb53e.tar.bz2 | |
re PR c++/65882 (Internal compiler error: Error reporting routines re-entered)
PR c++/65882
gcc/cp/
* call.c (build_new_op_1): Check tf_warning flag in all cases.
gcc/testsuite/
* g++.dg/diagnostic/inhibit-warn-1.C: New test.
* g++.dg/diagnostic/inhibit-warn-2.C: New test.
From-SVN: r224702
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eb5e4c5..6656441 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2015-06-20 Mikhail Maltsev <maltsevm@gmail.com> + + PR c++/65882 + * call.c (build_new_op_1): Check tf_warning flag in all cases. + 2015-06-19 Jason Merrill <jason@redhat.com> PR c++/66585 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 5d1891d..ba5da4c 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5640,8 +5640,9 @@ build_new_op_1 (location_t loc, enum tree_code code, int flags, tree arg1, case TRUTH_ORIF_EXPR: case TRUTH_AND_EXPR: case TRUTH_OR_EXPR: - warn_logical_operator (loc, code, boolean_type_node, - code_orig_arg1, arg1, code_orig_arg2, arg2); + if (complain & tf_warning) + warn_logical_operator (loc, code, boolean_type_node, + code_orig_arg1, arg1, code_orig_arg2, arg2); /* Fall through. */ case GT_EXPR: case LT_EXPR: @@ -5649,8 +5650,9 @@ build_new_op_1 (location_t loc, enum tree_code code, int flags, tree arg1, case LE_EXPR: case EQ_EXPR: case NE_EXPR: - if ((code_orig_arg1 == BOOLEAN_TYPE) - ^ (code_orig_arg2 == BOOLEAN_TYPE)) + if ((complain & tf_warning) + && ((code_orig_arg1 == BOOLEAN_TYPE) + ^ (code_orig_arg2 == BOOLEAN_TYPE))) maybe_warn_bool_compare (loc, code, arg1, arg2); /* Fall through. */ case PLUS_EXPR: |