From patchwork Thu Jan 31 23:12:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 217302 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 D559F2C0091 for ; Fri, 1 Feb 2013 10:13:00 +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=1360278781; h=Comment: DomainKey-Signature: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=apVwF6Q 12yo/CLZ3QRxAPTEx3Ac=; b=qtr4gg9BpwKutrfHczqGwQPbRrWpoQBocbV5ykp LU8n9XWO1bbUMvSZvasK76eQ2cIZUW8szeNhUgMXKKIc4zUHIQKzRxOmDmi5nfND HCvxGxhkON3H8FNxvf+2pomlWXMYc+nhoEB3Oj0OkColdVhyf/Cwt11Fp+eA5O6/ qHcw= 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:X-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=P28gl+e+eWCdiDTGsW+05PgGfrIlBmz1IayfxnaN+oo4a39LUAVp55YjM1el6m hXk/8sPPE1RIvtuvcbzKn9NzADBMl/R4Hw3LdsZkLviDbnUdC8b5Nq2TZsIdfJJf 645/Opp6sLV+mey20S5okb5GH1EDij4GDr9hG4Hqd4JdE=; Received: (qmail 20354 invoked by alias); 31 Jan 2013 23:12:54 -0000 Received: (qmail 20345 invoked by uid 22791); 31 Jan 2013 23:12:54 -0000 X-SWARE-Spam-Status: No, hits=-5.3 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, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-pa0-f54.google.com (HELO mail-pa0-f54.google.com) (209.85.220.54) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 31 Jan 2013 23:12:48 +0000 Received: by mail-pa0-f54.google.com with SMTP id fa10so308661pad.27 for ; Thu, 31 Jan 2013 15:12:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:subject:date:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=+HV6Fi10+XEGZaNFipq39a1+DPYUH0Gfu05XywSF9Jw=; b=LxxsmcAUPz+P3NtibY6mAVeRVLKyXLTQ4URnp97iri61g87qTvfkLTca1Ox3ukL25d zU+gcEWiXtVt89mz5kIijJ84l3IgWBnocLWJZY13ONrYIVatwXOswfZVjle5VbwAfRgt okGwTVzV9REpDbdREPIR3daVjwrlAS3q77BOLdfKYTH6cWpWIfgdCECY4qgpX5c6i3et sytjGnzb0aiHx8hFLIAzxQOfDdc40br3NVRlgc6z3jG4FAYBHjnliHcx1b0CqJ/xhtbZ GMW5ICFWHO+VmLv6AC2L4WQx0ORBuCmFaEvnAlzmvVYY8qz7S++zDDx6BhZEwGlJeaqp VUBQ== X-Received: by 10.66.82.200 with SMTP id k8mr24624705pay.56.1359673967679; Thu, 31 Jan 2013 15:12:47 -0800 (PST) Received: from iant-glaptop.google.com ([172.26.54.189]) by mx.google.com with ESMTPS id pq7sm5962278pbb.17.2013.01.31.15.12.46 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 31 Jan 2013 15:12:47 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Recognize morestack.S if no function name Date: Thu, 31 Jan 2013 15:12:43 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQn2lKveq0S1v45BpDNI0joWDl+4KhZulW/aY8Gu5iOq/PUYmxp3EHsDw9oL/8r0UmQu1ErzEj5rYqsGOSoDtS3DHVIuYIgxO+CEFBThLfeVAYDAKPCJFw6H/Zd9jkbARPFWbBjBH5ejGGUb5m9qoKJnA8L6CPflzT2m3TD6KxK/lntK/MxjYQVqzFdEB6KIw+RW0VXL 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 When using an old assembler it's possible to get debug info that says that a PC is in morestack.S but does not have the function name. This patch changes the Go backtrace code to recognize this case. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 388d41792584 libgo/runtime/go-callers.c --- a/libgo/runtime/go-callers.c Thu Jan 31 11:43:44 2013 -0800 +++ b/libgo/runtime/go-callers.c Thu Jan 31 15:11:01 2013 -0800 @@ -34,13 +34,24 @@ /* Skip split stack functions. */ if (function != NULL) { - const char *p = function; + const char *p; + p = function; if (__builtin_strncmp (p, "___", 3) == 0) ++p; if (__builtin_strncmp (p, "__morestack_", 12) == 0) return 0; } + else if (filename != NULL) + { + const char *p; + + p = strrchr (filename, '/'); + if (p == NULL) + p = filename; + if (__builtin_strncmp (p, "morestack.S", 11) == 0) + return 0; + } if (arg->skip > 0) {