From patchwork Sun Jun 10 17:17:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 27727 Received: (qmail 124183 invoked by alias); 10 Jun 2018 17:17:37 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 124172 invoked by uid 89); 10 Jun 2018 17:17:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.143.43) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 10 Jun 2018 17:17:34 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 3F1189111 for ; Sun, 10 Jun 2018 12:17:32 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id S3y8fhr91SjJAS3y8fHBoC; Sun, 10 Jun 2018 12:17:32 -0500 X-Authority-Reason: nr=8 Received: from 75-166-19-45.hlrn.qwest.net ([75.166.19.45]:41460 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fS3y7-000MGf-WD; Sun, 10 Jun 2018 12:17:32 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [FYI] Fix some missed "beneath" conversions Date: Sun, 10 Jun 2018 11:17:29 -0600 Message-Id: <20180610171729.24769-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fS3y7-000MGf-WD X-Source-Sender: 75-166-19-45.hlrn.qwest.net (bapiya.Home) [75.166.19.45]:41460 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes The buildbot pointed out that arm-linux-nat.c was not properly using "beneath" as a method. A search showed a few more places with this issue. Tested by the buildbot, though of course this only checked arm-linux-nat.c. Nevertheless I'm checking this in under the obvious rule. gdb/ChangeLog 2018-06-10 Tom Tromey * procfs.c (procfs_target::xfer_partial): Use "beneath" as a method. * nto-procfs.c (nto_procfs_target::xfer_partial): Use "beneath" as a method. * go32-nat.c (go32_nat_target::xfer_partial): Use "beneath" as a method. * arm-linux-nat.c (arm_linux_nat_target::read_description): Use "beneath" as a method. * arm-fbsd-nat.c (arm_fbsd_nat_target::read_description): Use "beneath" as a method. --- gdb/ChangeLog | 13 +++++++++++++ gdb/arm-fbsd-nat.c | 2 +- gdb/arm-linux-nat.c | 4 ++-- gdb/go32-nat.c | 6 +++--- gdb/nto-procfs.c | 6 +++--- gdb/procfs.c | 6 +++--- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/gdb/arm-fbsd-nat.c b/gdb/arm-fbsd-nat.c index 34b13354f32..bc3e0049a91 100644 --- a/gdb/arm-fbsd-nat.c +++ b/gdb/arm-fbsd-nat.c @@ -141,7 +141,7 @@ arm_fbsd_nat_target::read_description () desc = arm_fbsd_read_description_auxv (this); if (desc == NULL) - desc = this->beneath->read_description (); + desc = this->beneath ()->read_description (); return desc; } diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index 984bbe2fabf..d0b43132b8e 100644 --- a/gdb/arm-linux-nat.c +++ b/gdb/arm-linux-nat.c @@ -553,7 +553,7 @@ arm_linux_nat_target::read_description () if (target_auxv_search (this, AT_HWCAP, &arm_hwcap) != 1) { - return this->beneath->read_description (); + return this->beneath ()->read_description (); } if (arm_hwcap & HWCAP_IWMMXT) @@ -586,7 +586,7 @@ arm_linux_nat_target::read_description () return result; } - return this->beneath->read_description (); + return this->beneath ()->read_description (); } /* Information describing the hardware breakpoint capabilities. */ diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c index 81e2ea43a86..f00e424d464 100644 --- a/gdb/go32-nat.c +++ b/gdb/go32-nat.c @@ -655,9 +655,9 @@ go32_nat_target::xfer_partial (enum target_object object, return go32_xfer_memory (readbuf, writebuf, offset, len, xfered_len); default: - return this->beneath->xfer_partial (object, annex, - readbuf, writebuf, offset, len, - xfered_len); + return this->beneath ()->xfer_partial (object, annex, + readbuf, writebuf, offset, len, + xfered_len); } } diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index 63cae8afc06..a572fc166c7 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -995,9 +995,9 @@ nto_procfs_target::xfer_partial (enum target_object object, } /* Fallthru */ default: - return this->beneath->xfer_partial (object, annex, - readbuf, writebuf, offset, len, - xfered_len); + return this->beneath ()->xfer_partial (object, annex, + readbuf, writebuf, offset, len, + xfered_len); } } diff --git a/gdb/procfs.c b/gdb/procfs.c index 83b3d7ccccf..082f5d43745 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -2574,9 +2574,9 @@ procfs_target::xfer_partial (enum target_object object, offset, len, xfered_len); default: - return this->beneath->xfer_partial (object, annex, - readbuf, writebuf, offset, len, - xfered_len); + return this->beneath ()->xfer_partial (object, annex, + readbuf, writebuf, offset, len, + xfered_len); } }