From f7b8b261e78a327c70188a30778eb1268c91cdec Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 26 Mar 2011 18:31:36 +0000 Subject: [PATCH] Don't permit embedded field to be pointer to interface. From-SVN: r171558 --- gcc/go/gofrontend/expressions.cc | 5 +++- gcc/go/gofrontend/types.cc | 8 +++++++ gcc/testsuite/go.test/test/interface/embed.go | 23 +------------------ 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index e3a3ab593ee..f1a2ec7cb55 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -10135,7 +10135,10 @@ Interface_field_reference_expression::do_check_types(Gogo*) Interface_type* interface_type = type->interface_type(); if (interface_type == NULL) - this->report_error(_("expected interface or pointer to interface")); + { + if (!type->is_error_type()) + this->report_error(_("expected interface or pointer to interface")); + } else { const Typed_identifier* method = diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc index 2eecafd89d6..6ca22cb13b0 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -3464,6 +3464,14 @@ Struct_type::do_verify() p->set_type(Type::make_error_type()); 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; diff --git a/gcc/testsuite/go.test/test/interface/embed.go b/gcc/testsuite/go.test/test/interface/embed.go index 4a702398c67..2fddee1905a 100644 --- a/gcc/testsuite/go.test/test/interface/embed.go +++ b/gcc/testsuite/go.test/test/interface/embed.go @@ -4,7 +4,7 @@ // Use of this source code is governed by a BSD-style // 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 @@ -19,18 +19,12 @@ func (t T) M() int64 { return int64(t) } var t = T(Value) var pt = &t var ti Inter = t -var pti = &ti type S struct { Inter } var s = S{ ti } var ps = &s -type SP struct { *Inter } -var sp = SP{ &ti } -var psp = &sp - var i Inter -var pi = &i var ok = true @@ -45,35 +39,20 @@ func main() { check("t.M()", t.M()) check("pt.M()", pt.M()) check("ti.M()", ti.M()) - check("pti.M()", pti.M()) check("s.M()", s.M()) check("ps.M()", ps.M()) - check("sp.M()", sp.M()) - check("psp.M()", psp.M()) i = t check("i = t; i.M()", i.M()) - check("i = t; pi.M()", pi.M()) i = pt check("i = pt; i.M()", i.M()) - check("i = pt; pi.M()", pi.M()) i = s check("i = s; i.M()", i.M()) - check("i = s; pi.M()", pi.M()) i = ps 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 { println("BUG: interface10") -- 2.30.2