From patchwork Wed Jan 19 16:03: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: 79490 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 165A4B70AF for ; Thu, 20 Jan 2011 03:04:23 +1100 (EST) Received: (qmail 17197 invoked by alias); 19 Jan 2011 16:04:21 -0000 Received: (qmail 17187 invoked by uid 22791); 19 Jan 2011 16:04:20 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, 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) (74.125.121.67) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 19 Jan 2011 16:04:07 +0000 Received: from wpaz37.hot.corp.google.com (wpaz37.hot.corp.google.com [172.24.198.101]) by smtp-out.google.com with ESMTP id p0JG44gi003760 for ; Wed, 19 Jan 2011 08:04:04 -0800 Received: from pxi20 (pxi20.prod.google.com [10.243.27.20]) by wpaz37.hot.corp.google.com with ESMTP id p0JG2dqL025801 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NOT) for ; Wed, 19 Jan 2011 08:04:03 -0800 Received: by pxi20 with SMTP id 20so209106pxi.38 for ; Wed, 19 Jan 2011 08:04:02 -0800 (PST) Received: by 10.142.50.15 with SMTP id x15mr853145wfx.43.1295453042530; Wed, 19 Jan 2011 08:04:02 -0800 (PST) Received: from coign.google.com ([67.218.105.75]) by mx.google.com with ESMTPS id w42sm9766592wfh.3.2011.01.19.08.04.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 19 Jan 2011 08:04:01 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: Go patch committed: Check for error type in binary expression Date: Wed, 19 Jan 2011 08:03: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 adds a check for an erroneous type when determining the type of a binary expression. This avoids a later crash in a tuple assignment. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r c36661d8038e go/expressions.cc --- a/go/expressions.cc Wed Jan 19 07:46:28 2011 -0800 +++ b/go/expressions.cc Wed Jan 19 08:00:05 2011 -0800 @@ -5396,7 +5396,11 @@ { Type* left_type = this->left_->type(); Type* right_type = this->right_->type(); - if (!left_type->is_abstract() && left_type->named_type() != NULL) + if (left_type->is_error_type()) + return left_type; + else if (right_type->is_error_type()) + return right_type; + else if (!left_type->is_abstract() && left_type->named_type() != NULL) return left_type; else if (!right_type->is_abstract() && right_type->named_type() != NULL) return right_type;