aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2011-01-26 21:06:57 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2011-01-26 21:06:57 +0100
commit7273813a34b84fc64f8ec23abad9e4b637c3e097 (patch)
tree1a382eef761458761e42465c78ca92bf5de32aa3 /gcc
parentb800200de69f1e9a77813e3973a8ffeb821aa4c9 (diff)
downloadgcc-7273813a34b84fc64f8ec23abad9e4b637c3e097.zip
gcc-7273813a34b84fc64f8ec23abad9e4b637c3e097.tar.gz
gcc-7273813a34b84fc64f8ec23abad9e4b637c3e097.tar.bz2
re PR c/47473 (Incorrect computation with complex numbers when using -std=c99)
PR c/47473 * c-lex.c (interpret_float): If CPP_N_IMAGINARY, ensure EXCESS_PRECISION_EXPR is created with COMPLEX_TYPE instead of REAL_TYPE. * gcc.dg/torture/pr47473.c: New test. From-SVN: r169299
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-family/ChangeLog7
-rw-r--r--gcc/c-family/c-lex.c15
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/torture/pr47473.c14
4 files changed, 37 insertions, 4 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index ebcb5c2..d18ba20 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-26 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/47473
+ * c-lex.c (interpret_float): If CPP_N_IMAGINARY, ensure
+ EXCESS_PRECISION_EXPR is created with COMPLEX_TYPE instead of
+ REAL_TYPE.
+
2011-01-26 Arnaud Charlet <charlet@adacore.com>
* c-ada-spec.c (dump_generic_ada_node): Avoid dereferencing null type.
diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index 778e424..1ea57f1 100644
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -1,7 +1,7 @@
/* Mainly the interface between cpplib and the C front ends.
Copyright (C) 1987, 1988, 1989, 1992, 1994, 1995, 1996, 1997
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010,
+ 2011 Free Software Foundation, Inc.
This file is part of GCC.
@@ -752,8 +752,15 @@ interpret_float (const cpp_token *token, unsigned int flags)
/* Create a node with determined type and value. */
value = build_real (const_type, real);
if (flags & CPP_N_IMAGINARY)
- value = build_complex (NULL_TREE, convert (const_type, integer_zero_node),
- value);
+ {
+ value = build_complex (NULL_TREE, convert (const_type,
+ integer_zero_node), value);
+ if (type != const_type)
+ {
+ const_type = TREE_TYPE (value);
+ type = build_complex_type (type);
+ }
+ }
if (type != const_type)
value = build1 (EXCESS_PRECISION_EXPR, type, value);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ed90ed7..2744712 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-26 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/47473
+ * gcc.dg/torture/pr47473.c: New test.
+
2011-01-26 Jan Hubicka <jh@suse.cz>
PR target/47237
diff --git a/gcc/testsuite/gcc.dg/torture/pr47473.c b/gcc/testsuite/gcc.dg/torture/pr47473.c
new file mode 100644
index 0000000..92f2b87
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr47473.c
@@ -0,0 +1,14 @@
+/* PR c/47473 */
+/* { dg-do run } */
+/* { dg-options "-std=c99" } */
+
+int
+main (void)
+{
+ long double _Complex w = 0.2L - 0.3iL;
+ w = w * (0.3L - (0.0F + 1.0iF) * 0.9L);
+ if (__builtin_fabsl (__real__ w + 0.21L) > 0.001L
+ || __builtin_fabsl (__imag__ w + 0.27L) > 0.001L)
+ __builtin_abort ();
+ return 0;
+}