mirror of
https://github.com/golang/go
synced 2024-11-22 04:34:39 -07:00
gc: fix pc/line table
When a line directive was encountered we would push a new 'z' entry into the history to indicate the start of new file attributation, and a 'Z' entry to change line numbering. However we didn't pop the 'z' entry, so we were actually corrupting the history stack. The most obvious occurance of this was in the code that build the symbol tables for the DWARF information - where an internal stack in the linker would overflow when more than a few line directives were encountered in a single stack (Issue 1878). So now we pop the 'z' entry when we encounter the end of the file that the directive was in, which maintains the history stack integrity. Also, although new 'z' entries for new files had relative paths expanded, the same was not done for line directives. Now we do it for line directives also - so that the now correct DWARF information has the full path available. Fixes #1878. R=rsc CC=golang-dev https://golang.org/cl/4938042
This commit is contained in:
parent
33e9d24ad9
commit
b99d722963
@ -127,6 +127,7 @@ static void
|
||||
outhist(Biobuf *b)
|
||||
{
|
||||
Hist *h;
|
||||
int i, depth = 0;
|
||||
char *p, ds[] = {'c', ':', '/', 0};
|
||||
|
||||
for(h = hist; h != H; h = h->link) {
|
||||
@ -156,13 +157,21 @@ outhist(Biobuf *b)
|
||||
outzfile(b, p+1);
|
||||
} else {
|
||||
// relative name, like dir/file.go
|
||||
if(h->offset == 0 && pathname && pathname[0] == '/') {
|
||||
if(h->offset >= 0 && pathname && pathname[0] == '/') {
|
||||
zfile(b, "/", 1); // leading "/"
|
||||
outzfile(b, pathname+1);
|
||||
}
|
||||
outzfile(b, p);
|
||||
}
|
||||
}
|
||||
if(h->offset > 0) {
|
||||
//line directive
|
||||
depth++;
|
||||
}
|
||||
} else if(depth > 0) {
|
||||
for(i = 0; i < depth; i++)
|
||||
zhist(b, h->line, h->offset);
|
||||
depth = 0;
|
||||
}
|
||||
zhist(b, h->line, h->offset);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user