OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't permit embedded field to be pointer to interface.

Browse Source 
From-SVN: r171558
This commit is contained in:
Ian Lance Taylor 2011-03-26 18:31:36 +00:00
parent 84b4e06188
commit f7b8b261e7
3 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/go/gofrontend/expressions.cc
View File

@ -10135,7 +10135,10 @@ Interface_field_reference_expression::do_check_types(Gogo*)
Interface_type* interface_type = type->interface_type(); Interface_type* interface_type = type->interface_type();
if (interface_type == NULL) if (interface_type == NULL)
{
if (!type->is_error_type())
this->report_error(_("expected interface or pointer to interface")); this->report_error(_("expected interface or pointer to interface"));
}
else else
{ {
const Typed_identifier* method = const Typed_identifier* method =

8
gcc/go/gofrontend/types.cc
View File

@ -3464,6 +3464,14 @@ Struct_type::do_verify()
p->set_type(Type::make_error_type()); p->set_type(Type::make_error_type());
return false; return false;
} }
if (t->points_to() != NULL
&& t->points_to()->interface_type() != NULL)
{
error_at(p->location(),
"embedded type may not be pointer to interface");
p->set_type(Type::make_error_type());
return false;
}
} }
} }
return ret; return ret;

23
gcc/testsuite/go.test/test/interface/embed.go
View File

@ -4,7 +4,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// Check methods derived from embedded interface and *interface values. // Check methods derived from embedded interface values.
package main package main
@ -19,18 +19,12 @@ func (t T) M() int64 { return int64(t) }
var t = T(Value) var t = T(Value)
var pt = &t var pt = &t
var ti Inter = t var ti Inter = t
var pti = &ti
type S struct { Inter } type S struct { Inter }
var s = S{ ti } var s = S{ ti }
var ps = &s var ps = &s
type SP struct { *Inter }
var sp = SP{ &ti }
var psp = &sp
var i Inter var i Inter
var pi = &i
var ok = true var ok = true
@ -45,35 +39,20 @@ func main() {
check("t.M()", t.M()) check("t.M()", t.M())
check("pt.M()", pt.M()) check("pt.M()", pt.M())
check("ti.M()", ti.M()) check("ti.M()", ti.M())
check("pti.M()", pti.M())
check("s.M()", s.M()) check("s.M()", s.M())
check("ps.M()", ps.M()) check("ps.M()", ps.M())
check("sp.M()", sp.M())
check("psp.M()", psp.M())
i = t i = t
check("i = t; i.M()", i.M()) check("i = t; i.M()", i.M())
check("i = t; pi.M()", pi.M())
i = pt i = pt
check("i = pt; i.M()", i.M()) check("i = pt; i.M()", i.M())
check("i = pt; pi.M()", pi.M())
i = s i = s
check("i = s; i.M()", i.M()) check("i = s; i.M()", i.M())
check("i = s; pi.M()", pi.M())
i = ps i = ps
check("i = ps; i.M()", i.M()) check("i = ps; i.M()", i.M())
check("i = ps; pi.M()", pi.M())
i = sp
check("i = sp; i.M()", i.M())
check("i = sp; pi.M()", pi.M())
i = psp
check("i = psp; i.M()", i.M())
check("i = psp; pi.M()", pi.M())
if !ok { if !ok {
println("BUG: interface10") println("BUG: interface10")