procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix i686 bootstrap by temporarily disabling exporting of global ranges.

Browse source 
The patch converting evrp to the get_range_query(fun) API broke i686
bootstrap (commit 57bf37515).  The problem seems to be in a subsequent
pass that has more up-to-date global ranges.  I won't be able to look at
this until next week, so I am reverting the problematic bit of the
patch-- the exporting of global ranges once evrp finishes.  The use of
the new API remains.

Reverting the behavior shouldn't be a problem as we never used to export
global ranges from ranger.  This was new behavior in the patchset.

Tested on x86-64 Linux with a bootstrap and regtest, and on x86-32 with
only a bootstrap and the configure flags from the PR:

--enable-clocale=gnu --with-system-zlib --with-demangler-in-ld --with-fpmath=sse --enable-languages=c,c++ --enable-cet i686-linux --enable-bootstrap --with-fpmath=sse --disable-libcc1 --disable-libcilkrts --disable-libsanitizer

gcc/ChangeLog:

	PR tree-optimization/100787
	* gimple-ssa-evrp.c: Disable exporting of global ranges.

gcc/testsuite/ChangeLog:

	* gcc.dg/Wstringop-overflow-55.c:
	* gcc.dg/pr80776-1.c:
This commit is contained in:
Aldy Hernandez 2021-05-28 22:17:51 +02:00
parent 48166757dc
commit 2364b58455
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/gimple-ssa-evrp.c
View file

@ -127,7 +127,8 @@ public:
if (dump_file && (dump_flags & TDF_DETAILS))
m_ranger->dump (dump_file);
m_ranger->export_global_ranges ();
// FIXME: Do not export ranges until PR100787 is fixed.
//m_ranger->export_global_ranges ();
disable_ranger (cfun);
}
@ -193,7 +194,8 @@ public:
if (dump_file && (dump_flags & TDF_DETAILS))
m_ranger->dump (dump_file);
m_ranger->export_global_ranges ();
// FIXME: Do not export ranges until PR100787 is fixed.
//m_ranger->export_global_ranges ();
disable_ranger (cfun);
}

8
gcc/testsuite/gcc.dg/Wstringop-overflow-55.c
View file

@ -66,7 +66,7 @@ void warn_ptrdiff_anti_range_add (ptrdiff_t i)
{
i |= 1;
char ca5[5]; // { dg-message "at offset \\\[1, 5]" "pr?????" }
char ca5[5]; // { dg-message "at offset \\\[1, 5]" "pr?????" { xfail *-*-* } }
char *p0 = ca5; // offset
char *p1 = p0 + i; // 1-5
char *p2 = p1 + i; // 2-5
@ -74,7 +74,7 @@ void warn_ptrdiff_anti_range_add (ptrdiff_t i)
char *p4 = p3 + i; // 4-5
char *p5 = p4 + i; // 5
memset (p5, 0, 5); // { dg-warning "writing 5 bytes into a region of size" "pr?????" }
memset (p5, 0, 5); // { dg-warning "writing 5 bytes into a region of size 0" "pr?????" { xfail *-*-* } }
sink (p0, p1, p2, p3, p4, p5);
}
@ -83,7 +83,7 @@ void warn_int_anti_range (int i)
{
i |= 1;
char ca5[5]; // { dg-message "at offset \\\[1, 5]" "pr?????" }
char ca5[5]; // { dg-message "at offset \\\[1, 5]" "pr?????" { xfail *-*-* } }
char *p0 = ca5; // offset
char *p1 = p0 + i; // 1-5
char *p2 = p1 + i; // 2-5
@ -91,7 +91,7 @@ void warn_int_anti_range (int i)
char *p4 = p3 + i; // 4-5
char *p5 = p4 + i; // 5
memset (p5, 0, 5); // { dg-warning "writing 5 bytes into a region of size" "pr?????" }
memset (p5, 0, 5); // { dg-warning "writing 5 bytes into a region of size 0" "pr?????" { xfail *-*-* } }
sink (p0, p1, p2, p3, p4, p5);
}

4
gcc/testsuite/gcc.dg/pr80776-1.c
View file

@ -17,5 +17,7 @@ Foo (void)
__builtin_unreachable ();
if (! (0 <= i && i <= 999999))
__builtin_unreachable ();
sprintf (number, "%d", i); /* { dg-bogus "writing" "" } */
/* The correctness bits for [E]VRP cannot handle chained conditionals
when deciding to ignore a unreachable branch for setting SSA range info. */
sprintf (number, "%d", i); /* { dg-bogus "writing" "" { xfail *-*-* } } */
}