From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id 04F3F3858D32 for ; Sat, 21 Jan 2023 21:10:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 04F3F3858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id 78E081003BE16 for ; Sat, 21 Jan 2023 21:09:59 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id JL7fpYvLdgsICJL7fpbRlc; Sat, 21 Jan 2023 21:09:59 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=H7Ief8Ui c=1 sm=1 tr=0 ts=63cc54a7 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=IESmWlEkxeHAf8xLeeUA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=J5txZoGXI8GsLw+ivBM7G+4hSuf337e96Bf1g8uTbeQ=; b=itRdd+YmjWQbVAr5HNt1lZQO+C DUYyhriU1Vy2rqrdJEZtcOG4IVplUnjcBOep1O/sfCxIps+6NSsdnVcgjN2F42MN3otNb6wAHOrlU Och6WYrWCKzbkxO7yEpfc3iWv; Received: from [161.98.8.3] (port=57916 helo=prentzel.ci.boulder.co.us) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pJL7f-002Vd5-4p; Sat, 21 Jan 2023 14:09:59 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/2] Don't include block.h from expop.h Date: Sat, 21 Jan 2023 14:09:53 -0700 Message-Id: <20230121210954.3284323-2-tom@tromey.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230121210954.3284323-1-tom@tromey.com> References: <20230121210954.3284323-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 161.98.8.3 X-Source-L: No X-Exim-ID: 1pJL7f-002Vd5-4p X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (prentzel.ci.boulder.co.us) [161.98.8.3]:57916 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: expop.h needs block.h for a single inline function. However, I don't think most of the check_objfile functions need to be defined in the header (just the templates). This patch moves the one offending function and removes the include. --- gdb/expop.h | 8 ++------ gdb/expprint.c | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gdb/expop.h b/gdb/expop.h index 9e6ab0dd244..bfe55e4f2fd 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -20,7 +20,6 @@ #ifndef EXPOP_H #define EXPOP_H -#include "block.h" #include "c-lang.h" #include "cp-abi.h" #include "expression.h" @@ -229,11 +228,8 @@ check_objfile (struct symbol *sym, struct objfile *objfile) return check_objfile (sym->objfile (), objfile); } -static inline bool -check_objfile (const struct block *block, struct objfile *objfile) -{ - return check_objfile (block_objfile (block), objfile); -} +extern bool check_objfile (const struct block *block, + struct objfile *objfile); static inline bool check_objfile (const block_symbol &sym, struct objfile *objfile) diff --git a/gdb/expprint.c b/gdb/expprint.c index b70645fac92..63004f7f106 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -75,6 +75,12 @@ debug_exp (struct expression *exp) namespace expr { +bool +check_objfile (const struct block *block, struct objfile *objfile) +{ + return check_objfile (block_objfile (block), objfile); +} + void dump_for_expression (struct ui_file *stream, int depth, enum exp_opcode op) { -- 2.39.0