From patchwork Thu Mar 3 00:54:56 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: 85197 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 7D60BB7063 for ; Thu, 3 Mar 2011 11:55:13 +1100 (EST) Received: (qmail 5258 invoked by alias); 3 Mar 2011 00:55:11 -0000 Received: (qmail 5248 invoked by uid 22791); 3 Mar 2011 00:55:09 -0000 X-SWARE-Spam-Status: No, hits=-2.2 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; Thu, 03 Mar 2011 00:55:04 +0000 Received: from kpbe17.cbf.corp.google.com (kpbe17.cbf.corp.google.com [172.25.105.81]) by smtp-out.google.com with ESMTP id p230t24b018342 for ; Wed, 2 Mar 2011 16:55:02 -0800 Received: from iwn36 (iwn36.prod.google.com [10.241.68.100]) by kpbe17.cbf.corp.google.com with ESMTP id p230t0Bj016096 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Wed, 2 Mar 2011 16:55:01 -0800 Received: by iwn36 with SMTP id 36so630131iwn.22 for ; Wed, 02 Mar 2011 16:55:00 -0800 (PST) Received: by 10.231.59.197 with SMTP id m5mr453742ibh.25.1299113700494; Wed, 02 Mar 2011 16:55:00 -0800 (PST) Received: from coign.google.com ([67.218.107.6]) by mx.google.com with ESMTPS id d21sm411577ibg.3.2011.03.02.16.54.58 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Mar 2011 16:55:00 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: Go patch committed: Don't crash on erroneous named result Date: Wed, 02 Mar 2011 16:54:56 -0800 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 This patch to the Go frontend avoids crashing if there is an erroneous named result, such as a result parameter with the same name as a regular parameter. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r a43381c7d981 go/gogo-tree.cc --- a/go/gogo-tree.cc Wed Mar 02 16:40:45 2011 -0800 +++ b/go/gogo-tree.cc Wed Mar 02 16:45:21 2011 -0800 @@ -1786,8 +1786,14 @@ // defer statements, the result variables may be unnamed. bool is_named = !results->front().name().empty(); if (is_named) - gcc_assert(this->named_results_ != NULL - && this->named_results_->size() == results->size()); + { + gcc_assert(this->named_results_ != NULL); + if (this->named_results_->size() != results->size()) + { + gcc_assert(saw_errors()); + return error_mark_node; + } + } tree retval; if (results->size() == 1)