Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile/internal/gc: fix internal compiler error on invalid declaration

Browse source 
Following an empty import, a declaration involving a ? symbol
generates an internal compiler error when the name of the
symbol (in newname function).

package a
import""
var?

go.go:2: import path is empty
go.go:3: internal compiler error: newname nil

Make sure dclname is not called when the symbol is nil.
The error message is now:

go.go:2: import path is empty
go.go:3: invalid declaration
go.go:4: syntax error: unexpected EOF

This CL was initially meant to be applied to the old parser,
and has been updated to apply to the new parser.

Fixes #11610

Change-Id: I75e07622fb3af1d104e3a38c89d9e128e3b94522
Reviewed-on: https://go-review.googlesource.com/15268
Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
Didier Spezia 2015-10-04 20:33:02 +00:00 • committed by Russ Cox
parent 715f63778d
commit 70da2d0a2a
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/cmd/compile/internal/gc/parser.go
View file

@ -1738,6 +1738,18 @@ func (p *parser) new_name(sym *Sym) *Node {
return nil
}
func (p *parser) dcl_name(sym *Sym) *Node {
if trace && Debug['x'] != 0 {
defer p.trace("dcl_name")()
}
if sym == nil {
yyerrorl(int(prevlineno), "invalid declaration")
return nil
}
return dclname(sym)
}
func (p *parser) onew_name() *Node {
if trace && Debug['x'] != 0 {
defer p.trace("onew_name")()
@ -2736,9 +2748,9 @@ func (p *parser) dcl_name_list() *NodeList {
defer p.trace("dcl_name_list")()
}
l := list1(dclname(p.sym()))
l := list1(p.dcl_name(p.sym()))
for p.got(',') {
l = list(l, dclname(p.sym()))
l = list(l, p.dcl_name(p.sym()))
}
return l
}