diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2018-02-13 21:23:22 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2018-02-13 21:23:22 +0000 |
| commit | 3a9ad4c190409ee4a9d20ad4f4d1349302e90da7 (patch) | |
| tree | 0885f4bb59ba743ef65131f2501c9b4cd248417a | |
| parent | a2f5a78214edc4716e6f97b97fb7839a211e8ff7 (diff) | |
| download | gcc-3a9ad4c190409ee4a9d20ad4f4d1349302e90da7.zip gcc-3a9ad4c190409ee4a9d20ad4f4d1349302e90da7.tar.gz gcc-3a9ad4c190409ee4a9d20ad4f4d1349302e90da7.tar.bz2 | |
re PR c++/84333 (ICE with ternary operator in template function)
/cp
2018-02-13 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84333
* call.c (build_conditional_expr_1): Use cp_save_expr instead of
save_expr for the G++ extension.
/testsuite
2018-02-13 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84333
* g++.dg/template/sizeof16.C: New.
* g++.dg/template/sizeof17.C: Likewise.
From-SVN: r257638
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/call.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/sizeof16.C | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/sizeof17.C | 7 |
5 files changed, 27 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7c52ede..84fb909 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-02-13 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84333 + * call.c (build_conditional_expr_1): Use cp_save_expr instead of + save_expr for the G++ extension. + 2018-02-13 Jason Merrill <jason@redhat.com> PR c++/84080 - ICE with return type deduction and specialization. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 15b723a..7176e4a 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4805,7 +4805,7 @@ build_conditional_expr_1 (location_t loc, tree arg1, tree arg2, tree arg3, if (lvalue_p (arg1)) arg2 = arg1 = cp_stabilize_reference (arg1); else - arg2 = arg1 = save_expr (arg1); + arg2 = arg1 = cp_save_expr (arg1); } /* If something has already gone wrong, just pass that fact up the diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e0edbe5..f22c21a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-02-13 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84333 + * g++.dg/template/sizeof16.C: New. + * g++.dg/template/sizeof17.C: Likewise. + 2018-02-13 Janus Weil <janus@gcc.gnu.org> PR fortran/84313 diff --git a/gcc/testsuite/g++.dg/template/sizeof16.C b/gcc/testsuite/g++.dg/template/sizeof16.C new file mode 100644 index 0000000..084bb21 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/sizeof16.C @@ -0,0 +1,7 @@ +// PR c++/84333 +// { dg-options -Wno-pedantic } + +template<typename> int foo() +{ + return sizeof(int) > 1 ? : 1; +} diff --git a/gcc/testsuite/g++.dg/template/sizeof17.C b/gcc/testsuite/g++.dg/template/sizeof17.C new file mode 100644 index 0000000..2d5892d --- /dev/null +++ b/gcc/testsuite/g++.dg/template/sizeof17.C @@ -0,0 +1,7 @@ +// PR c++/84333 +// { dg-options -Wno-pedantic } + +template<typename T> int foo() +{ + return sizeof(T) > 1 ? : 1; +} |