From patchwork Tue Dec 21 06:13:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 76261 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 2D6D2B70A7 for ; Tue, 21 Dec 2010 17:13:38 +1100 (EST) Received: (qmail 19577 invoked by alias); 21 Dec 2010 06:13:35 -0000 Received: (qmail 19569 invoked by uid 22791); 21 Dec 2010 06:13:34 -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, TW_FN, 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; Tue, 21 Dec 2010 06:13:29 +0000 Received: from kpbe13.cbf.corp.google.com (kpbe13.cbf.corp.google.com [172.25.105.77]) by smtp-out.google.com with ESMTP id oBL6DRwi003958 for ; Mon, 20 Dec 2010 22:13:27 -0800 Received: from iwr19 (iwr19.prod.google.com [10.241.69.83]) by kpbe13.cbf.corp.google.com with ESMTP id oBL6D5Ik031404 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NOT) for ; Mon, 20 Dec 2010 22:13:26 -0800 Received: by iwr19 with SMTP id 19so5175556iwr.37 for ; Mon, 20 Dec 2010 22:13:26 -0800 (PST) Received: by 10.42.166.197 with SMTP id p5mr5177837icy.368.1292912006296; Mon, 20 Dec 2010 22:13:26 -0800 (PST) Received: from coign.google.com (adsl-71-133-8-30.dsl.pltn13.pacbell.net [71.133.8.30]) by mx.google.com with ESMTPS id k38sm4556526ick.21.2010.12.20.22.13.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 20 Dec 2010 22:13:25 -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 return statement Date: Mon, 20 Dec 2010 22:13:18 -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 on an erroneous return statement. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 674433f32c65 go/statements.cc --- a/go/statements.cc Fri Dec 17 19:00:58 2010 -0800 +++ b/go/statements.cc Mon Dec 20 17:35:22 2010 -0800 @@ -2567,6 +2567,8 @@ { Function* function = context->function()->func_value(); tree fndecl = function->get_decl(); + if (fndecl == error_mark_node || DECL_RESULT(fndecl) == error_mark_node) + return error_mark_node; const Typed_identifier_list* results = this->results_; @@ -2580,6 +2582,8 @@ tree set; if (retval == NULL_TREE) set = NULL_TREE; + else if (retval == error_mark_node) + return error_mark_node; else set = fold_build2_loc(this->location(), MODIFY_EXPR, void_type_node, DECL_RESULT(fndecl), retval); @@ -2591,13 +2595,13 @@ { gcc_assert(!VOID_TYPE_P(TREE_TYPE(TREE_TYPE(fndecl)))); tree val = (*this->vals_->begin())->get_tree(context); - if (val == error_mark_node) - return error_mark_node; gcc_assert(results != NULL && results->size() == 1); val = Expression::convert_for_assignment(context, results->begin()->type(), (*this->vals_->begin())->type(), val, this->location()); + if (val == error_mark_node) + return error_mark_node; tree set = build2(MODIFY_EXPR, void_type_node, DECL_RESULT(fndecl), val); SET_EXPR_LOCATION(set, this->location()); @@ -2618,11 +2622,11 @@ { gcc_assert(pv != this->vals_->end()); tree val = (*pv)->get_tree(context); - if (val == error_mark_node) - return error_mark_node; val = Expression::convert_for_assignment(context, pr->type(), (*pv)->type(), val, this->location()); + if (val == error_mark_node) + return error_mark_node; tree set = build2(MODIFY_EXPR, void_type_node, build3(COMPONENT_REF, TREE_TYPE(field), retvar, field, NULL_TREE),