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

pch: Fix up Darwin and HPUX pch_use_address hooks [PR71934]

Browse source 
In the last change, I've changed the arguments from void * to void *&,
but missed the fact that these hooks will in that case update the value
the caller will see in an undesirable way.

2021-12-09  Jakub Jelinek  <jakub@redhat.com>

	PR pch/71934
	* config/host-darwin.c (darwin_gt_pch_use_address): When reading
	manually the file into mapped area, update mapped_addr as
	an automatic variable rather than addr which is a reference parameter.
	* config/host-hpux.c (hpux_gt_pch_use_address): When reading
	manually the file into mapped area, update addr as
	an automatic variable rather than base which is a reference parameter.
This commit is contained in:
Jakub Jelinek 2021-12-09 15:54:33 +01:00
parent 747380f47d
commit bf15cd665e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/config/host-darwin.c
View file

@ -185,10 +185,10 @@ darwin_gt_pch_use_address (void *&addr, size_t sz, int fd, size_t off)
{
ssize_t nbytes;
nbytes = read (fd, addr, MIN (sz, (size_t) -1 >> 1));
nbytes = read (fd, mapped_addr, MIN (sz, (size_t) -1 >> 1));
if (nbytes <= 0)
return -1;
addr = (char *) addr + nbytes;
mapped_addr = (char *) mapped_addr + nbytes;
sz -= nbytes;
}

4
gcc/config/host-hpux.c
View file

@ -115,10 +115,10 @@ hpux_gt_pch_use_address (void *&base, size_t size, int fd, size_t offset)
{
ssize_t nbytes;
nbytes = read (fd, base, MIN (size, SSIZE_MAX));
nbytes = read (fd, addr, MIN (size, SSIZE_MAX));
if (nbytes <= 0)
return -1;
base = (char *) base + nbytes;
addr = (char *) addr + nbytes;
size -= nbytes;
}