From patchwork Tue Jan 4 18:24:08 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: 77508 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 BC447B7043 for ; Wed, 5 Jan 2011 05:24:24 +1100 (EST) Received: (qmail 16112 invoked by alias); 4 Jan 2011 18:24:21 -0000 Received: (qmail 16102 invoked by uid 22791); 4 Jan 2011 18:24:20 -0000 X-SWARE-Spam-Status: No, hits=-2.7 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) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 04 Jan 2011 18:24:16 +0000 Received: from hpaq13.eem.corp.google.com (hpaq13.eem.corp.google.com [172.25.149.13]) by smtp-out.google.com with ESMTP id p04IOEqv026488 for ; Tue, 4 Jan 2011 10:24:14 -0800 Received: from pzk9 (pzk9.prod.google.com [10.243.19.137]) by hpaq13.eem.corp.google.com with ESMTP id p04IOC7s007183 for ; Tue, 4 Jan 2011 10:24:13 -0800 Received: by pzk9 with SMTP id 9so3309876pzk.29 for ; Tue, 04 Jan 2011 10:24:12 -0800 (PST) Received: by 10.142.233.2 with SMTP id f2mr18355444wfh.395.1294165452029; Tue, 04 Jan 2011 10:24:12 -0800 (PST) Received: from coign.google.com (dhcp-172-22-123-229.mtv.corp.google.com [172.22.123.229]) by mx.google.com with ESMTPS id o1sm7131069wfl.14.2011.01.04.10.24.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 04 Jan 2011 10:24:10 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: Go patch committed: Don't crash if package import fails Date: Tue, 04 Jan 2011 10:24:08 -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 importing a package fails. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r bc39dd879d69 go/gogo.cc --- a/go/gogo.cc Tue Jan 04 10:15:03 2011 -0800 +++ b/go/gogo.cc Tue Jan 04 10:21:08 2011 -0800 @@ -330,8 +330,11 @@ Import imp(stream, location); imp.register_builtin_types(this); Package* package = imp.import(this, local_name, is_local_name_exported); - this->imports_.insert(std::make_pair(filename, package)); - package->set_is_imported(); + if (package != NULL) + { + this->imports_.insert(std::make_pair(filename, package)); + package->set_is_imported(); + } delete stream; }