qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 07:20:02 -07:00
Code Releases Activity

gc: preserve original expression for errors

Browse Source 
Fixes #1722.

R=ken2
CC=golang-dev
https://golang.org/cl/4442099
This commit is contained in:
Russ Cox 2011-04-28 13:14:35 -04:00
parent f319e1df37
commit 8133cb3565
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cmd/gc/go.h
View File

@ -225,6 +225,7 @@ struct Node
Type* realtype; // as determined by typecheck Type* realtype; // as determined by typecheck
NodeList* list; NodeList* list;
NodeList* rlist; NodeList* rlist;
Node* orig; // original form, for printing
// for-body // for-body
NodeList* ninit; NodeList* ninit;

2
src/cmd/gc/subr.c
View File

@ -1454,6 +1454,8 @@ Nconv(Fmt *fp)
} }
if(fp->flags & FmtSharp) { if(fp->flags & FmtSharp) {
if(n->orig != N)
n = n->orig;
exprfmt(fp, n, 0); exprfmt(fp, n, 0);
goto out; goto out;
} }

21
src/cmd/gc/typecheck.c
View File

@ -894,12 +894,20 @@ reswitch:
// might be constant // might be constant
switch(t->etype) { switch(t->etype) {
case TSTRING: case TSTRING:
if(isconst(l, CTSTR)) if(isconst(l, CTSTR)) {
nodconst(n, types[TINT], l->val.u.sval->len); r = nod(OXXX, N, N);
nodconst(r, types[TINT], l->val.u.sval->len);
r->orig = n;
n = r;
}
break; break;
case TARRAY: case TARRAY:
if(t->bound >= 0 && l->op == ONAME) if(t->bound >= 0 && l->op == ONAME) {
nodconst(n, types[TINT], t->bound); r = nod(OXXX, N, N);
nodconst(r, types[TINT], t->bound);
r->orig = n;
n = r;
}
break; break;
} }
n->type = types[TINT]; n->type = types[TINT];
@ -1357,7 +1365,10 @@ ret:
goto error; goto error;
} }
if((top & Etop) && !(top & (Ecall|Erv|Etype)) && !(ok & Etop)) { if((top & Etop) && !(top & (Ecall|Erv|Etype)) && !(ok & Etop)) {
yyerror("%#N not used", n); if(n->diag == 0) {
yyerror("%#N not used", n);
n->diag = 1;
}
goto error; goto error;
} }

19
test/fixedbugs/bug337.go Normal file
View File

@ -0,0 +1,19 @@
// errchk $G $D/$F.go
// Copyright 2011 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// Issue 1722.
// Check that the error messages says
// bug337.go:16: len("foo") not used
// and not
// bug337.go:16: 3 not used
package main
func main() {
len("foo") // ERROR "len"
}