mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 19:11:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c/33193 (slopiness in __real/__imag)

Browse Source 
gcc/
	PR c/33193
	* c-typeck.c (build_unary_op): Call build_real_imag_expr for
	REALPART_EXPR and IMAGPART_EXPR.

gcc/c-family/
	PR c/33193
	* c-common.h (build_real_imag_expr): Declare.
	* c-semantics.c (build_real_imag_expr): Define.

gcc/cp/
	PR c/33193
	* typeck.c (cp_build_unary_op): Call build_real_imag_expr for
	REALPART_EXPR and IMAGPART_EXPR.

gcc/testsuite/
	PR c/33193
	* c-c++-common/pr33193.c: New test.

From-SVN: r166909
This commit is contained in:
Nathan Froyd 2010-11-18 16:24:56 +00:00 committed by Nathan Froyd
parent cfaa55890b
commit fb52b50a92
9 changed files with 82 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2010-11-18 Nathan Froyd <froydnj@codesourcery.com>
PR c/33193
* c-typeck.c (build_unary_op): Call build_real_imag_expr for
REALPART_EXPR and IMAGPART_EXPR.
2010-11-18 Richard Guenther <rguenther@suse.de>
PR tree-optimization/46172

6
gcc/c-family/ChangeLog
View File

@ -1,3 +1,9 @@
2010-11-18 Nathan Froyd <froydnj@codesourcery.com>
PR c/33193
* c-common.h (build_real_imag_expr): Declare.
* c-semantics.c (build_real_imag_expr): Define.
2010-11-17 Joseph Myers <joseph@codesourcery.com>
* c-opts.c (c_common_parse_file): Take no arguments.

1
gcc/c-family/c-common.h
View File

@ -822,6 +822,7 @@ extern void warn_for_omitted_condop (location_t, tree);
extern tree do_case (location_t, tree, tree);
extern tree build_stmt (location_t, enum tree_code, ...);
extern tree build_case_label (location_t, tree, tree, tree);
extern tree build_real_imag_expr (location_t, enum tree_code, tree);
/* These functions must be defined by each front-end which implements
a variant of the C language. They are used in c-common.c. */

32
gcc/c-family/c-semantics.c
View File

@ -140,3 +140,35 @@ build_case_label (location_t loc,
{
return build_stmt (loc, CASE_LABEL_EXPR, low_value, high_value, label_decl);
}
/* Build a REALPART_EXPR or IMAGPART_EXPR, according to CODE, from ARG. */
tree
build_real_imag_expr (location_t location, enum tree_code code, tree arg)
{
tree ret;
tree arg_type = TREE_TYPE (arg);
gcc_assert (code == REALPART_EXPR || code == IMAGPART_EXPR);
if (TREE_CODE (arg_type) == COMPLEX_TYPE)
{
ret = build1 (code, TREE_TYPE (TREE_TYPE (arg)), arg);
SET_EXPR_LOCATION (ret, location);
}
else if (INTEGRAL_TYPE_P (arg_type) || SCALAR_FLOAT_TYPE_P (arg_type))
{
ret = (code == REALPART_EXPR
? arg
: omit_one_operand_loc (location, arg_type,
integer_zero_node, arg));
}
else
{
error_at (location, "wrong type argument to %s",
code == REALPART_EXPR ? "__real" : "__imag");
ret = error_mark_node;
}
return ret;
}

22
gcc/c-typeck.c
View File

@ -3561,26 +3561,10 @@ build_unary_op (location_t location,
goto return_build_unary_op;
case REALPART_EXPR:
if (TREE_CODE (arg) == COMPLEX_CST)
ret = TREE_REALPART (arg);
else if (TREE_CODE (TREE_TYPE (arg)) == COMPLEX_TYPE)
ret = fold_build1_loc (location,
REALPART_EXPR, TREE_TYPE (TREE_TYPE (arg)), arg);
else
ret = arg;
if (eptype && TREE_CODE (eptype) == COMPLEX_TYPE)
eptype = TREE_TYPE (eptype);
goto return_build_unary_op;
case IMAGPART_EXPR:
if (TREE_CODE (arg) == COMPLEX_CST)
ret = TREE_IMAGPART (arg);
else if (TREE_CODE (TREE_TYPE (arg)) == COMPLEX_TYPE)
ret = fold_build1_loc (location,
IMAGPART_EXPR, TREE_TYPE (TREE_TYPE (arg)), arg);
else
ret = omit_one_operand_loc (location, TREE_TYPE (arg),
integer_zero_node, arg);
ret = build_real_imag_expr (location, code, arg);
if (ret == error_mark_node)
return error_mark_node;
if (eptype && TREE_CODE (eptype) == COMPLEX_TYPE)
eptype = TREE_TYPE (eptype);
goto return_build_unary_op;

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2010-11-18 Nathan Froyd <froydnj@codesourcery.com>
PR c/33193
* typeck.c (cp_build_unary_op): Call build_real_imag_expr for
REALPART_EXPR and IMAGPART_EXPR.
2010-11-16 Jason Merrill <jason@redhat.com>
* call.c (convert_like_real): Don't make a temp for copy-list-init.

22
gcc/cp/typeck.c
View File

@ -5098,26 +5098,12 @@ cp_build_unary_op (enum tree_code code, tree xarg, int noconvert,
break;
case REALPART_EXPR:
if (TREE_CODE (arg) == COMPLEX_CST)
return TREE_REALPART (arg);
else if (TREE_CODE (TREE_TYPE (arg)) == COMPLEX_TYPE)
{
arg = build1 (REALPART_EXPR, TREE_TYPE (TREE_TYPE (arg)), arg);
return fold_if_not_in_template (arg);
}
else
return arg;
case IMAGPART_EXPR:
if (TREE_CODE (arg) == COMPLEX_CST)
return TREE_IMAGPART (arg);
else if (TREE_CODE (TREE_TYPE (arg)) == COMPLEX_TYPE)
{
arg = build1 (IMAGPART_EXPR, TREE_TYPE (TREE_TYPE (arg)), arg);
return fold_if_not_in_template (arg);
}
arg = build_real_imag_expr (input_location, code, arg);
if (arg == error_mark_node)
return arg;
else
return cp_convert (TREE_TYPE (arg), integer_zero_node);
return fold_if_not_in_template (arg);
case PREINCREMENT_EXPR:
case POSTINCREMENT_EXPR:

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2010-11-18 Nathan Froyd <froydnj@codesourcery.com>
PR c/33193
* c-c++-common/pr33193.c: New test.
2010-11-18 Richard Guenther <rguenther@suse.de>
PR tree-optimization/46172

19
gcc/testsuite/c-c++-common/pr33193.c Normal file
View File

@ -0,0 +1,19 @@
/* PR c/33193 */
/* { dg-do compile } */
struct a {float x, y; };
float f(struct a b)
{
/* The error messages here are different between C and C++, so just
make sure we get an error. */
float x = __real b; /* { dg-error "" } */
float y = __imag b; /* { dg-error "" } */
return x / y;
}
int f1(int *b)
{
float x = __imag b; /* { dg-error "wrong type argument" } */
float y = __real b; /* { dg-error "wrong type argument" } */
return x - y;
}