qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 05:17:57 -07:00
Code Releases Activity

bug167

Browse Source 
R=ken
OCL=31295
CL=31295
This commit is contained in:
Russ Cox 2009-07-07 11:48:22 -07:00
parent 80e4a053d7
commit a1b64821f8
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmd/gc/dcl.c
View File

@ -104,7 +104,7 @@ void
updatetype(Type *n, Type *t) updatetype(Type *n, Type *t)
{ {
Sym *s; Sym *s;
int local; int local, vargen;
int maplineno, lno, etype; int maplineno, lno, etype;
s = n->sym; s = n->sym;
@ -141,13 +141,14 @@ updatetype(Type *n, Type *t)
// that is no longer associated with n. // that is no longer associated with n.
maplineno = n->maplineno; maplineno = n->maplineno;
local = n->local; local = n->local;
vargen = n->vargen;
*n = *t; *n = *t;
n->sym = s; n->sym = s;
n->local = local; n->local = local;
n->siggen = 0; n->siggen = 0;
n->printed = 0; n->printed = 0;
n->method = nil; n->method = nil;
n->vargen = 0; n->vargen = vargen;
n->nod = N; n->nod = N;
// catch declaration of incomplete type // catch declaration of incomplete type

2
src/cmd/ld/go.c
View File

@ -200,7 +200,7 @@ loadpkgdata(char *file, char *data, int len)
} else if((ndef = forwardfix(x->def, def)) != nil) { } else if((ndef = forwardfix(x->def, def)) != nil) {
x->def = ndef; x->def = ndef;
} else { } else {
fprint(2, "%d: conflicting definitions for %s\n", argv0, name); fprint(2, "%s: conflicting definitions for %s\n", argv0, name);
fprint(2, "%s:\t%s %s %s\n", x->file, x->prefix, name, x->def); fprint(2, "%s:\t%s %s %s\n", x->file, x->prefix, name, x->def);
fprint(2, "%s:\t%s %s %s\n", file, prefix, name, def); fprint(2, "%s:\t%s %s %s\n", file, prefix, name, def);
nerrors++; nerrors++;

0
test/bugs/bug167.go → test/fixedbugs/bug167.go
View File

6
test/golden.out
View File

@ -105,12 +105,6 @@ BUG: bug159
123 123
BUG: should fail BUG: should fail
=========== bugs/bug167.go
BUG: bug167
1606416656: conflicting definitions for main.T·bug167
bug167.6: type main.T·bug167 struct { x int }
bug167.6: type main.T·bug167 struct { x float }
=========== fixedbugs/bug016.go =========== fixedbugs/bug016.go
fixedbugs/bug016.go:7: constant -3 overflows uint fixedbugs/bug016.go:7: constant -3 overflows uint