Fix TYPE_OVERFLOW_* cleanup fallout

Message ID	20141212134807.GX16332@redhat.com
State	New
Headers	show Return-Path: <gcc-patches-return-387274-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=SijZKPwfvKqPYIOLdqgf13HZXhk159gHLg5Ou4E6/yp7aBRvUSFTA 6W5/CPmrkkOuREo2IQuRlLEZL284Rdp+mkfGnNj2vJ23QrECS/usB3F9t7oCl64a mylzqN5V+TPLYfMaxxY21l5t5mLwT20JY38OZ7sBvdErX6YBMn86QY= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org Date: Fri, 12 Dec 2014 14:48:07 +0100 From: Marek Polacek <polacek@redhat.com> To: Richard Biener <rguenther@suse.de>, GCC Patches <gcc-patches@gcc.gnu.org> Subject: [PATCH] Fix TYPE_OVERFLOW_* cleanup fallout Message-ID: <20141212134807.GX16332@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12)

Message ID

20141212134807.GX16332@redhat.com

State

New

Headers

DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id
	:list-unsubscribe:list-archive:list-post:list-help:sender:date
	:from:to:subject:message-id:mime-version:content-type; q=dns; s=
	default; b=SijZKPwfvKqPYIOLdqgf13HZXhk159gHLg5Ou4E6/yp7aBRvUSFTA
	6W5/CPmrkkOuREo2IQuRlLEZL284Rdp+mkfGnNj2vJ23QrECS/usB3F9t7oCl64a
	mylzqN5V+TPLYfMaxxY21l5t5mLwT20JY38OZ7sBvdErX6YBMn86QY=
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
Sender: gcc-patches-owner@gcc.gnu.org
Date: Fri, 12 Dec 2014 14:48:07 +0100
From: Marek Polacek <polacek@redhat.com>
To: Richard Biener <rguenther@suse.de>, GCC Patches <gcc-patches@gcc.gnu.org>
Subject: [PATCH] Fix TYPE_OVERFLOW_* cleanup fallout
Message-ID: <20141212134807.GX16332@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.23 (2014-03-12)

Commit Message

Marek Polacek Dec. 12, 2014, 1:48 p.m. UTC

On ARM we ICE on fixed-point-exec.c testcase because TYPE_OVERFLOW_WRAPS
was missing the ANY_INTEGRAL_TYPE_P check.

Bootstrapped/regtested on x86_64-linux and ppc64-linux, ok for trunk?

2014-12-12  Marek Polacek  <polacek@redhat.com>

	PR middle-end/64274
	* fold-const.c (fold_binary_loc): Add ANY_INTEGRAL_TYPE_P check.


	Marek

Comments

Richard Biener Dec. 12, 2014, 1:50 p.m. UTC | #1

On Fri, 12 Dec 2014, Marek Polacek wrote:

> On ARM we ICE on fixed-point-exec.c testcase because TYPE_OVERFLOW_WRAPS
> was missing the ANY_INTEGRAL_TYPE_P check.
> 
> Bootstrapped/regtested on x86_64-linux and ppc64-linux, ok for trunk?

Ok.

THanks,
Richard.

> 2014-12-12  Marek Polacek  <polacek@redhat.com>
> 
> 	PR middle-end/64274
> 	* fold-const.c (fold_binary_loc): Add ANY_INTEGRAL_TYPE_P check.
> 
> diff --git gcc/fold-const.c gcc/fold-const.c
> index ec5ad98..d71fa94 100644
> --- gcc/fold-const.c
> +++ gcc/fold-const.c
> @@ -10082,7 +10082,8 @@ fold_binary_loc (location_t loc,
>  	  /* Reassociate (plus (plus (mult) (foo)) (mult)) as
>  	     (plus (plus (mult) (mult)) (foo)) so that we can
>  	     take advantage of the factoring cases below.  */
> -	  if (TYPE_OVERFLOW_WRAPS (type)
> +	  if (ANY_INTEGRAL_TYPE_P (type)
> +	      && TYPE_OVERFLOW_WRAPS (type)
>  	      && (((TREE_CODE (arg0) == PLUS_EXPR
>  		    || TREE_CODE (arg0) == MINUS_EXPR)
>  		   && TREE_CODE (arg1) == MULT_EXPR)
> 
> 	Marek
> 
>

Kyrylo Tkachov Dec. 12, 2014, 1:57 p.m. UTC | #2

On 12/12/14 13:48, Marek Polacek wrote:
> On ARM we ICE on fixed-point-exec.c testcase because TYPE_OVERFLOW_WRAPS
> was missing the ANY_INTEGRAL_TYPE_P check.
>
> Bootstrapped/regtested on x86_64-linux and ppc64-linux, ok for trunk?

Also arm-none-linux-gnueabihf bootstrap is in late stage3 and looks fine.

Thanks,
Kyril

>
> 2014-12-12  Marek Polacek  <polacek@redhat.com>
>
> 	PR middle-end/64274
> 	* fold-const.c (fold_binary_loc): Add ANY_INTEGRAL_TYPE_P check.
>
> diff --git gcc/fold-const.c gcc/fold-const.c
> index ec5ad98..d71fa94 100644
> --- gcc/fold-const.c
> +++ gcc/fold-const.c
> @@ -10082,7 +10082,8 @@ fold_binary_loc (location_t loc,
>   	  /* Reassociate (plus (plus (mult) (foo)) (mult)) as
>   	     (plus (plus (mult) (mult)) (foo)) so that we can
>   	     take advantage of the factoring cases below.  */
> -	  if (TYPE_OVERFLOW_WRAPS (type)
> +	  if (ANY_INTEGRAL_TYPE_P (type)
> +	      && TYPE_OVERFLOW_WRAPS (type)
>   	      && (((TREE_CODE (arg0) == PLUS_EXPR
>   		    || TREE_CODE (arg0) == MINUS_EXPR)
>   		   && TREE_CODE (arg1) == MULT_EXPR)
>
> 	Marek
>

diff --git gcc/fold-const.c gcc/fold-const.c
index ec5ad98..d71fa94 100644
--- gcc/fold-const.c
+++ gcc/fold-const.c
@@ -10082,7 +10082,8 @@  fold_binary_loc (location_t loc,
 	  /* Reassociate (plus (plus (mult) (foo)) (mult)) as
 	     (plus (plus (mult) (mult)) (foo)) so that we can
 	     take advantage of the factoring cases below.  */
-	  if (TYPE_OVERFLOW_WRAPS (type)
+	  if (ANY_INTEGRAL_TYPE_P (type)
+	      && TYPE_OVERFLOW_WRAPS (type)
 	      && (((TREE_CODE (arg0) == PLUS_EXPR
 		    || TREE_CODE (arg0) == MINUS_EXPR)
 		   && TREE_CODE (arg1) == MULT_EXPR)