OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backport: re PR target/84700 (ICE on 32-bit BE powerpc targets w/ -misel -O1) 

Backported from mainline
	2018-03-05  Jakub Jelinek  <jakub@redhat.com>

	PR target/84700
	* combine.c (combine_simplify_rtx): Don't try to simplify if
	if_then_else_cond returned non-NULL, but either true_rtx or false_rtx
	are equal to x.

	* gcc.target/powerpc/pr84700.c: New test.

From-SVN: r261913
This commit is contained in:
Jakub Jelinek 2018-06-22 22:29:34 +02:00 committed by Jakub Jelinek
parent deea4ea79b
commit 8ae01fd0b7
5 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/ChangeLog
View File

@ -1,14 +1,12 @@
2018-06-22 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
2018-03-02 Jakub Jelinek <jakub@redhat.com>
2018-03-05 Jakub Jelinek <jakub@redhat.com>
PR c++/84662
* pt.c (tsubst_copy_and_build) <case TEMPLATE_ID_EXPR>: Use
RETURN instead of return.
<case POINTER_PLUS_EXPR>: Likewise.
<case CONVERT_EXPR>: If op0 is error_mark_node, just return
it instead of wrapping it into CONVERT_EXPR.
PR target/84700
* combine.c (combine_simplify_rtx): Don't try to simplify if
if_then_else_cond returned non-NULL, but either true_rtx or false_rtx
are equal to x.
2018-06-22 Andre Vieira <andre.simoesdiasvieira@arm.com>

6
gcc/combine.c
View File

@ -5637,7 +5637,11 @@ combine_simplify_rtx (rtx x, machine_mode op0_mode, int in_dest,
/* If everything is a comparison, what we have is highly unlikely
to be simpler, so don't use it. */
&& ! (COMPARISON_P (x)
&& (COMPARISON_P (true_rtx) || COMPARISON_P (false_rtx))))
&& (COMPARISON_P (true_rtx) || COMPARISON_P (false_rtx)))
/* Similarly, if we end up with one of the expressions the same
as the original, it is certainly not simpler. */
&& ! rtx_equal_p (x, true_rtx)
&& ! rtx_equal_p (x, false_rtx))
{
rtx cop1 = const0_rtx;
enum rtx_code cond_code = simplify_comparison (NE, &cond, &cop1);

12
gcc/cp/ChangeLog
View File

@ -1,3 +1,15 @@
2018-06-22 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
2018-03-02 Jakub Jelinek <jakub@redhat.com>
PR c++/84662
* pt.c (tsubst_copy_and_build) <case TEMPLATE_ID_EXPR>: Use
RETURN instead of return.
<case POINTER_PLUS_EXPR>: Likewise.
<case CONVERT_EXPR>: If op0 is error_mark_node, just return
it instead of wrapping it into CONVERT_EXPR.
2018-06-12 Jason Merrill <jason@redhat.com>
PR c++/85815 - reference to member of enclosing template.

5
gcc/testsuite/ChangeLog
View File

@ -1,6 +1,11 @@
2018-06-22 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
2018-03-05 Jakub Jelinek <jakub@redhat.com>
PR target/84700
* gcc.target/powerpc/pr84700.c: New test.
2018-03-02 Jakub Jelinek <jakub@redhat.com>
PR c++/84662

12
gcc/testsuite/gcc.target/powerpc/pr84700.c Normal file
View File

@ -0,0 +1,12 @@
/* PR target/84700 */
/* { dg-do compile } */
/* { dg-options "-O1 -misel" } */
long long int
foo (long long int x)
{
long long int a = x < 2;
int b = a >= 0;
return a + ((x == 0) ? a : b);
}