diff options
| author | Jason Merrill <jason@redhat.com> | 2011-04-20 02:30:41 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-04-20 02:30:41 -0400 |
| commit | 68a29e1cf46e63f8a50a8548287d93207bc04c34 (patch) | |
| tree | bef2b57920fa2c68a5fd708b8ea2abb21e73e86f | |
| parent | b48de48389275f9e7af3912fb4a14da5b18b2fca (diff) | |
| download | gcc-68a29e1cf46e63f8a50a8548287d93207bc04c34.zip gcc-68a29e1cf46e63f8a50a8548287d93207bc04c34.tar.gz gcc-68a29e1cf46e63f8a50a8548287d93207bc04c34.tar.bz2 | |
re PR c++/46304 (g++ crashes with ICE in bitmap_first_set_bit, at bitmap.c:770)
PR c++/46304
* typeck.c (cp_build_binary_op): Fold COMPLEX_EXPR.
From-SVN: r172754
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/complex7.C | 6 |
4 files changed, 16 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7feb427..c7068ab 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-04-19 Jason Merrill <jason@redhat.com> + PR c++/46304 + * typeck.c (cp_build_binary_op): Fold COMPLEX_EXPR. + PR c++/45267 * decl.c (duplicate_decls): Keep always_inline attribute in sync with DECL_DISREGARD_INLINE_LIMITS. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 89d3247..dcdc790 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4357,7 +4357,11 @@ cp_build_binary_op (location_t location, gcc_unreachable(); } } - return build2 (COMPLEX_EXPR, result_type, real, imag); + real = fold_if_not_in_template (real); + imag = fold_if_not_in_template (imag); + result = build2 (COMPLEX_EXPR, result_type, real, imag); + result = fold_if_not_in_template (result); + return result; } /* For certain operations (which identify themselves by shorten != 0) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7e5d187..84c9d7c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,7 @@ 2011-04-19 Jason Merrill <jason@redhat.com> + * g++.dg/ext/complex7.C: New. + * g++.dg/ext/attrib41.C: New. 2011-04-19 Kaz Kojima <kkojima@gcc.gnu.org> diff --git a/gcc/testsuite/g++.dg/ext/complex7.C b/gcc/testsuite/g++.dg/ext/complex7.C new file mode 100644 index 0000000..9d5463f --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/complex7.C @@ -0,0 +1,6 @@ +// { dg-options "" } + +class A +{ + static const _Complex double x = 1.0 + 2.0i; +}; |