From patchwork Fri Mar 9 05:32:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 145660 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 78721B6FA3 for ; Fri, 9 Mar 2012 16:32:48 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1331875970; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Subject:Date:Message-ID:User-Agent: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=P/qFEEu30Rq3AJjfu6hn+sJmGhM=; b=Adr1PrhXqeVbcjL RenNktVoIZ1pzIFIXt8YOkB4FFNMnSlv9M0E+B1mpgi9TnvQ5hUdTVNR0ntKHvu5 Go6iulSfns+W1iYrgXV5vTqtIIyPowM9nt3NAeH2/IJbq2f4x4HMIGgT03+0eRpu DhGg5V+UCCnMTLUohqseqsp5PGfI= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:Received:Received:Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=iR4lOJNsNSPWojnzBzwIgdJiIPV2O0WamV12PeGVU9RafdAvJm3JaGP9MaNaKL pgmZevxcehfl9KDx6BhfZ5L5SOmLtKcmQPy1CMX2xm41cSFZU1h9s3K9LyJ1b4AF DpBQnDxMy6QZO4xc0QywwS4MqNZMZbFxLQrTh8W2py5D0=; Received: (qmail 16571 invoked by alias); 9 Mar 2012 05:32:43 -0000 Received: (qmail 16555 invoked by uid 22791); 9 Mar 2012 05:32:42 -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, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-iy0-f175.google.com (HELO mail-iy0-f175.google.com) (209.85.210.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 09 Mar 2012 05:32:15 +0000 Received: by iaag37 with SMTP id g37so1841842iaa.20 for ; Thu, 08 Mar 2012 21:32:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=I57h12xyn5ryzNfn7xM2wZbrADaFrKlQBdMCTJpC3r8=; b=YaUUivYPCN6eZM8zZcmArx3/Nsj+4ZyDAC6HyXnzo2u8FKhtgxsJGQQ2f33iyRWw3F VqQO1eCmRlgbAWbTT8GCZ145odZ/mwthXHIQOQiEtS/qQ2ncDteJCrSI3To3b5J7mR7/ znBHGM0XmrwaA8sLXrX+JfRoy7MYcT/TQ1VLYNPuxcvmB9qQiDIXLWPgq9Ub8Pv9QRWo eDIkd1TG5RkYNa1FslI/KMd6NTxNJT5KHOb/FQD5kbcmQoseRmMs4D/h7G95AiakNCXX iQoOUufe5BhbmAr80qafyzgjW9l/SGYi6eJiDp2QgLLrcTuPzIrDKCUKb+oo+D9uNzGf 1PYg== Received: by 10.42.18.195 with SMTP id y3mr1166325ica.13.1331271135122; Thu, 08 Mar 2012 21:32:15 -0800 (PST) Received: by 10.42.18.195 with SMTP id y3mr1166312ica.13.1331271135000; Thu, 08 Mar 2012 21:32:15 -0800 (PST) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id mi10sm866390igc.8.2012.03.08.21.32.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Mar 2012 21:32:14 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Don't crash if can't get line numbers Date: Thu, 08 Mar 2012 21:32:12 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkazJx2QWMN6tcNBRWwcFgYqaQg4qWf9IoPcKz8aA0lEeVtnWLbI2N1N48MEeUbYaRlrmiVfFBgsrl1ddInu/aXdfAqIRKnmLBiZp+4Kuv0f7OG1e/nq7vv1oD28wgCuX5VTna/lrdA+lC3SvOM5sjv/eA9gx+hh9PWHSDLYXWAFb3XkAA= 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 libgo avoids crashing the program if for some reason we can't get line number information. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 27261b2b1db7 libgo/go/debug/elf/runtime.go --- a/libgo/go/debug/elf/runtime.go Thu Mar 08 15:28:14 2012 -0800 +++ b/libgo/go/debug/elf/runtime.go Thu Mar 08 21:28:13 2012 -0800 @@ -129,7 +129,7 @@ // and line number for a PC value. func funcFileLine(pc uintptr, function *string, file *string, line *int) bool { openExecutable() - if executable.dwarf == nil { + if executable == nil || executable.dwarf == nil { return false } f, ln, err := executable.dwarf.FileLine(uint64(pc))