1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
$NetBSD: patch-gcc_ggc-common.c,v 1.1 2013/09/11 19:05:19 martin Exp $
When failing a PCH read-in, restore some globals to allow the generic
error reporting to work in pre-PCH context.
Patch submitted upstream in http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58381
--- gcc/ggc-common.c.orig 2013-03-05 16:51:48.000000000 +0100
+++ gcc/ggc-common.c 2013-09-10 17:20:52.000000000 +0200
@@ -666,6 +666,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
@@ -677,39 +679,60 @@
/* 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 ("can%'t 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 ("can%'t read PCH file: %m");
+ }
for (rt = gt_pch_cache_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 ("can%'t 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 ("can%'t 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 ("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 ("can%'t 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 ("can%'t read PCH file: %m");
+ }
ggc_pch_read (f, mmi.preferred_base);
|
