code review 4530084: gc: check parameter declarations in interface fields

gc: check parameter declarations in interface fields

Fixes issue 1871.

[ality, 2011-05-30 11:23:51]

Hello rsc@golang.org (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://go.googlecode.com/hg/

[lstoakes, 2011-05-30 11:53:21]

Awesome. This fixes issue 1663 also (they should probably be merged I think).

On 30 May 2011 12:23,  <ality@pbrane.org> wrote:
> Reviewers: rsc,
>
> Message:
> Hello rsc@golang.org (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> gc: check parameter declarations in interface fields
>
> Fixes issue 1871.
>
> Please review this at http://codereview.appspot.com/4530084/
>
> Affected files:
>  M src/cmd/gc/dcl.c
>  M src/cmd/gc/go.h
>  M src/cmd/gc/go.y
>  A test/fixedbugs/bug342.go
>
>
> Index: src/cmd/gc/dcl.c
> ===================================================================
> --- a/src/cmd/gc/dcl.c
> +++ b/src/cmd/gc/dcl.c
> @@ -524,6 +524,30 @@
>  }
>
>  /*
> + * declare the arguments in an
> + * interface field declaration.
> + */
> +void
> +ifacedcl(Node *n)
> +{
> +       if(n->op != ODCLFIELD || n->right == N)
> +               fatal("ifacedcl");
> +
> +       dclcontext = PAUTO;
> +       markdcl();
> +       funcdepth++;
> +       n->outer = curfn;
> +       curfn = n;
> +       funcargs(n->right);
> +
> +       // funcbody is normally called after the parser has
> +       // seen the body of a function but since an interface
> +       // field declaration does not have a body, we must
> +       // call it now to pop the current declaration context.
> +       funcbody(n);
> +}
> +
> +/*
>  * declare the function proper
>  * and declare the arguments.
>  * called in extern-declaration context
> Index: src/cmd/gc/go.h
> ===================================================================
> --- a/src/cmd/gc/go.h
> +++ b/src/cmd/gc/go.h
> @@ -870,6 +870,7 @@
>  void   funccompile(Node *n, int isclosure);
>  void   funchdr(Node *n);
>  Type*  functype(Node *this, NodeList *in, NodeList *out);
> +void   ifacedcl(Node *n);
>  int    isifacemethod(Type *f);
>  void   markdcl(void);
>  Node*  methodname(Node *n, Type *t);
> Index: src/cmd/gc/go.y
> ===================================================================
> --- a/src/cmd/gc/go.y
> +++ b/src/cmd/gc/go.y
> @@ -1380,6 +1380,7 @@
>        new_name indcl
>        {
>                $$ = nod(ODCLFIELD, $1, $2);
> +               ifacedcl($$);
>        }
>  |      packname
>        {
> Index: test/fixedbugs/bug342.go
> ===================================================================
> new file mode 100644
> --- /dev/null
> +++ b/test/fixedbugs/bug342.go
> @@ -0,0 +1,24 @@
> +// 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 1871.
> +
> +package p
> +
> +type a interface {
> +       foo(x int) (x int) // ERROR "redeclared|redefinition"
> +}
> +
> +var b interface {
> +       bar(y int) (y int) // ERROR "redeclared|redefinition"
> +}
> +
> +/*
> +Previously:
> +
> +bug.go:1 x redclared in this block
> +    previous declaration at bug.go:1
> +*/
>
>
>



-- 
Lorenzo Stoakes
http://www.codegrunt.co.uk

[rsc, 2011-05-31 17:41:22]

LGTM

[rsc, 2011-05-31 17:42:10]

*** Submitted as http://code.google.com/p/go/source/detail?r=65d17888197e ***

gc: check parameter declarations in interface fields

Fixes issue 1663.
Fixes issue 1871.

R=rsc, lstoakes
CC=golang-dev
http://codereview.appspot.com/4530084

Committer: Russ Cox <rsc@golang.org>