71 lines
2.5 KiB
C
71 lines
2.5 KiB
C
$NetBSD: patch-gcc_ggc-common.c,v 1.1 2017/05/03 00:21:03 maya Exp $
|
|
|
|
--- gcc/ggc-common.c.orig 2019-11-12 11:09:41.000000000 +0100
|
|
+++ gcc/ggc-common.c 2020-01-03 23:25:42.695208424 +0100
|
|
@@ -591,6 +591,8 @@
|
|
size_t i;
|
|
struct mmap_info mmi;
|
|
int result;
|
|
+ struct line_maps * old_line_table = line_table;
|
|
+ location_t old_input_loc = input_location;
|
|
|
|
/* Delete any deletable objects. This makes ggc_pch_read much
|
|
faster, as it can be sure that no GCable objects remain other
|
|
@@ -602,32 +604,50 @@
|
|
/* Read in all the scalar variables. */
|
|
for (rt = gt_pch_scalar_rtab; *rt; rt++)
|
|
for (rti = *rt; rti->base != NULL; rti++)
|
|
- if (fread (rti->base, rti->stride, 1, f) != 1)
|
|
+ if (fread (rti->base, rti->stride, 1, f) != 1) {
|
|
+ line_table = old_line_table;
|
|
+ input_location = old_input_loc;
|
|
fatal_error (input_location, "cannot read PCH file: %m");
|
|
+ }
|
|
|
|
/* Read in all the global pointers, in 6 easy loops. */
|
|
for (rt = gt_ggc_rtab; *rt; rt++)
|
|
for (rti = *rt; rti->base != NULL; rti++)
|
|
for (i = 0; i < rti->nelt; i++)
|
|
if (fread ((char *)rti->base + rti->stride * i,
|
|
- sizeof (void *), 1, f) != 1)
|
|
+ sizeof (void *), 1, f) != 1) {
|
|
+ line_table = old_line_table;
|
|
+ input_location = old_input_loc;
|
|
fatal_error (input_location, "cannot read PCH file: %m");
|
|
+ }
|
|
|
|
- if (fread (&mmi, sizeof (mmi), 1, f) != 1)
|
|
+ if (fread (&mmi, sizeof (mmi), 1, f) != 1) {
|
|
+ line_table = old_line_table;
|
|
+ input_location = old_input_loc;
|
|
fatal_error (input_location, "cannot read PCH file: %m");
|
|
+ }
|
|
|
|
result = host_hooks.gt_pch_use_address (mmi.preferred_base, mmi.size,
|
|
fileno (f), mmi.offset);
|
|
- if (result < 0)
|
|
+ if (result < 0) {
|
|
+ line_table = old_line_table;
|
|
+ input_location = old_input_loc;
|
|
fatal_error (input_location, "had to relocate PCH");
|
|
+ }
|
|
if (result == 0)
|
|
{
|
|
if (fseek (f, mmi.offset, SEEK_SET) != 0
|
|
- || fread (mmi.preferred_base, mmi.size, 1, f) != 1)
|
|
+ || fread (mmi.preferred_base, mmi.size, 1, f) != 1) {
|
|
+ line_table = old_line_table;
|
|
+ input_location = old_input_loc;
|
|
fatal_error (input_location, "cannot read PCH file: %m");
|
|
+ }
|
|
}
|
|
- else if (fseek (f, mmi.offset + mmi.size, SEEK_SET) != 0)
|
|
+ else if (fseek (f, mmi.offset + mmi.size, SEEK_SET) != 0) {
|
|
+ line_table = old_line_table;
|
|
+ input_location = old_input_loc;
|
|
fatal_error (input_location, "cannot read PCH file: %m");
|
|
+ }
|
|
|
|
ggc_pch_read (f, mmi.preferred_base);
|
|
|