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

Avoid assuming SSA_NAME_IDENTIFIER is nonnull.

Browse source 
gcc/c-family/ChangeLog:

	* c-pretty-print.c (c_pretty_printer::primary_expression): Don't
	assume SSA_NAME_IDENTIFIER evaluates to nonzero.
This commit is contained in:
Martin Sebor 2021-01-17 15:27:08 -07:00
parent 0f4c8f517b
commit 192105b6a2
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gcc/c-family/c-pretty-print.c
View file

@ -1340,18 +1340,23 @@ c_pretty_printer::primary_expression (tree e)
if (SSA_NAME_VAR (e))
{
tree var = SSA_NAME_VAR (e);
const char *name = IDENTIFIER_POINTER (SSA_NAME_IDENTIFIER (e));
const char *dot;
if (DECL_ARTIFICIAL (var) && (dot = strchr (name, '.')))
if (tree id = SSA_NAME_IDENTIFIER (e))
{
/* Print the name without the . suffix (such as in VLAs).
Use pp_c_identifier so that it can be converted into
the appropriate encoding. */
size_t size = dot - name;
char *ident = XALLOCAVEC (char, size + 1);
memcpy (ident, name, size);
ident[size] = '\0';
pp_c_identifier (this, ident);
const char *name = IDENTIFIER_POINTER (id);
const char *dot;
if (DECL_ARTIFICIAL (var) && (dot = strchr (name, '.')))
{
/* Print the name without the . suffix (such as in VLAs).
Use pp_c_identifier so that it can be converted into
the appropriate encoding. */
size_t size = dot - name;
char *ident = XALLOCAVEC (char, size + 1);
memcpy (ident, name, size);
ident[size] = '\0';
pp_c_identifier (this, ident);
}
else
primary_expression (var);
}
else
primary_expression (var);