From patchwork Sat Mar 26 18:31:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 88474 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 37089B6F93 for ; Sun, 27 Mar 2011 05:32:01 +1100 (EST) Received: (qmail 29101 invoked by alias); 26 Mar 2011 18:31:58 -0000 Received: (qmail 29089 invoked by uid 22791); 26 Mar 2011 18:31:56 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 26 Mar 2011 18:31:46 +0000 Received: from kpbe12.cbf.corp.google.com (kpbe12.cbf.corp.google.com [172.25.105.76]) by smtp-out.google.com with ESMTP id p2QIVj31007322 for ; Sat, 26 Mar 2011 11:31:45 -0700 Received: from pwi14 (pwi14.prod.google.com [10.241.219.14]) by kpbe12.cbf.corp.google.com with ESMTP id p2QIVhHc032670 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Sat, 26 Mar 2011 11:31:44 -0700 Received: by pwi14 with SMTP id 14so423689pwi.35 for ; Sat, 26 Mar 2011 11:31:43 -0700 (PDT) Received: by 10.142.128.17 with SMTP id a17mr1898435wfd.110.1301164303327; Sat, 26 Mar 2011 11:31:43 -0700 (PDT) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id w27sm3161549wfd.16.2011.03.26.11.31.41 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 26 Mar 2011 11:31:42 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: Go patch committed: Don't permit embedded pointer to interface Date: Sat, 26 Mar 2011 11:31:40 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org The Go language has changed to specify that the type of an embedded field in a struct may not be a pointer to an interface type. This patch implements that restrictions in gccgo. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r e318745d1f78 go/expressions.cc --- a/go/expressions.cc Fri Mar 25 23:05:28 2011 -0700 +++ b/go/expressions.cc Sat Mar 26 11:29:36 2011 -0700 @@ -10135,7 +10135,10 @@ 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 -r e318745d1f78 go/types.cc --- a/go/types.cc Fri Mar 25 23:05:28 2011 -0700 +++ b/go/types.cc Sat Mar 26 11:29:36 2011 -0700 @@ -3464,6 +3464,14 @@ 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; Index: gcc/testsuite/go.test/test/interface/embed.go =================================================================== --- gcc/testsuite/go.test/test/interface/embed.go (revision 171359) +++ gcc/testsuite/go.test/test/interface/embed.go (working copy) @@ -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")