MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86: Check cfun != NULL before accessing silent_p

Browse Source 
Since construct_container may be called with cfun == NULL, check
cfun != NULL before accessing silent_p.

gcc/

	PR target/99679
	* config/i386/i386.c (construct_container): Check cfun != NULL
	before accessing silent_p.

gcc/testsuite/

	PR target/99679
	* g++.target/i386/pr99679-1.C: New test.
	* g++.target/i386/pr99679-2.C: Likewise.
This commit is contained in:
H.J. Lu 2021-03-20 05:17:36 -07:00
parent 9f59cb7cac
commit 19ff0b0d81
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/config/i386/i386.c
View File

@ -2540,7 +2540,7 @@ construct_container (machine_mode mode, machine_mode orig_mode,
{
/* Return early if we shouldn't raise an error for invalid
calls. */
if (cfun->machine->silent_p)
if (cfun != NULL && cfun->machine->silent_p)
return NULL;
if (in_return)
{
@ -2568,7 +2568,7 @@ construct_container (machine_mode mode, machine_mode orig_mode,
{
/* Return early if we shouldn't raise an error for invalid
calls. */
if (cfun->machine->silent_p)
if (cfun != NULL && cfun->machine->silent_p)
return NULL;
if (!issued_x87_ret_error)
{

17
gcc/testsuite/g++.target/i386/pr99679-1.C Normal file
View File

@ -0,0 +1,17 @@
// { dg-do compile }
// { dg-options "-Ofast -fipa-pta -mno-80387" }
#include <stdarg.h>
extern "C" void abort (void);
void
foo (int x, ...)
{
long double ld;
va_list ap;
va_start (ap, x);
ld = va_arg (ap, long double);
if (ld)
abort ();
} // { dg-error "x87 register return with x87 disabled" "" { target { ! ia32 } } }

17
gcc/testsuite/g++.target/i386/pr99679-2.C Normal file
View File

@ -0,0 +1,17 @@
// { dg-do compile }
// { dg-options "-Ofast -fipa-pta -mgeneral-regs-only" }
#include <stdarg.h>
extern "C" void abort (void);
void
foo (int x, ...)
{
double ld;
va_list ap;
va_start (ap, x);
ld = va_arg (ap, double); // { dg-error "SSE register argument with SSE disabled" "" { target { ! ia32 } } }
if (ld)
abort ();
} // { dg-error "SSE register return with SSE disabled" "" { target { ! ia32 } } }