From patchwork Wed May 16 05:36:49 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: 159519 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 DA3A6B6FBD for ; Wed, 16 May 2012 15:41:40 +1000 (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=1337751702; 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=baFrh5ximcbGSJGS4Ig/tDCxYBM=; b=qJjA93Bm6LfxtFY cXrqkPs97kxF7h3YkV9ET+XQuO4XvBm4PiZm9deitLMq7EtbR/sgZ03X9uHXy1NM jeKWEueiM/k6okF/X4AGbMzz5n5Izkpc8rC/rV14hACAJJ2i329AecBxkmxcnxQT bIJ9UtlkXnPMqqqZ1iqO4P72frjU= 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=T0ebi/RM+2hjJ4tbnqHb7srYiqYi5hpci8YXVHMNZNdjsp/kZlK9s2mCPNxWSn f77HeGBEcCUv6EqLauUGPSqUpf8Q47Q84Vnu3sWfK6ar3sy8dqSIuGszSP69m6H3 KkS51uwObRwZT261rp1/iGkf3aYm7CBpvTkmhQeR9zY0c=; Received: (qmail 20339 invoked by alias); 16 May 2012 05:41:32 -0000 Received: (qmail 20321 invoked by uid 22791); 16 May 2012 05:41:25 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-pz0-f47.google.com (HELO mail-pz0-f47.google.com) (209.85.210.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 16 May 2012 05:36:51 +0000 Received: by dalh21 with SMTP id h21so493010dal.20 for ; Tue, 15 May 2012 22:36:51 -0700 (PDT) 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=LphK46OyrV5mggtW9jqht2t2gTzdxcDbUc1RMqDhxiY=; b=DpA1PYxhXuv+TSmd6Y0p7j2wbBygxklQs4enXWUMOqO4ystVTBhKadCd0QOjpQPMwb UUg1JNpCbAryht1dOoZ6fEI+i/NaS043Atgp+m39LxHIRiChEshveg8K7NeeYCwd1Ej0 VlI3WAdWMi0IZywfEnWyyRNdQr/5GLk33AS2IpyghWXEiTOF3vTE6Ewnun4/WynpIQUO 5KsS4t8nBsLylAT5VKfzg/YOBbd0rqp1GSb7gbeE3ZOxLCMn9Vg9WtrxQlzOc7CR4AqZ RFXYXs3q2erDGMWZoytQ8yGGRp81zIZRRSvYhIMigwo9yezv9wdMvVOl5/N79J2JYcYb u8BQ== Received: by 10.68.218.194 with SMTP id pi2mr12993877pbc.100.1337146611332; Tue, 15 May 2012 22:36:51 -0700 (PDT) Received: by 10.68.218.194 with SMTP id pi2mr12993840pbc.100.1337146611083; Tue, 15 May 2012 22:36:51 -0700 (PDT) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id py5sm4272653pbb.1.2012.05.15.22.36.50 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 May 2012 22:36:50 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Fix handling of LineSetFile in DWARF line info Date: Tue, 15 May 2012 22:36:49 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmc3NBD1h0jCb1LoAK4MZDkAZuu5idoW4ce2yCZbPu826MN1jZpU23V84gKkjdafHy4iedeiRF81wwCEUfBB0HuS+5XTGiHU4XZENlnC33CkJ4Zq/P+UrgM6oWwbLrbFgOkXOwL+DSKVRK/kdhx6nBovFFXkw== 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 libgo patch fixes the handling of LineSetFile aka DW_LNS_set_file in DWARF line info. The DWARF number is one-based, but I am using it to index into a zero-based array. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline and 4.7 branch. Ian diff -r dd8c9c38c8c7 libgo/go/debug/dwarf/line.go --- a/libgo/go/debug/dwarf/line.go Tue May 15 17:25:30 2012 -0700 +++ b/libgo/go/debug/dwarf/line.go Tue May 15 22:33:39 2012 -0700 @@ -359,7 +359,7 @@ b.error("DWARF file number out of range") return } - lineInfo.Filename = hdr.files[i] + lineInfo.Filename = hdr.files[i-1] newLineInfo = true case LineSetColumn: lineInfo.Column = int(b.uint())