From patchwork Tue Jun 18 15:08:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1949231 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NvggSCxu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W3VYK15Fhz20Wb for ; Wed, 19 Jun 2024 01:10:13 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 60CBC3888839 for ; Tue, 18 Jun 2024 15:10:11 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 5AAE33882AFB for ; Tue, 18 Jun 2024 15:08:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5AAE33882AFB Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5AAE33882AFB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718723320; cv=none; b=MG/d1MxT3XVPAckGd0+hfv8cOK3i270mp/JR0saNsPiI+KQc7KMZF7GFoGq7BSxY00myeP9rRMbQstAQ6pQ/XPzbPfD+fR66eBzaQQj/j6KGQTusx//Rtb1Z021glk9yGXS5HHS+2pDFCrIVpz/spTDd1FEe9q8az+TmR1hdn7s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718723320; c=relaxed/simple; bh=pSMPMPlNYNVYwt1fbueU0MKfPMI2Wtgr9UzZgNt0hZo=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=wfnUoxVj5Ecv8iSWiJz2kBzJ//auT3n0lE9uwiJoCrgQyJbyTDnXs7AlSqeZHDYWQeIdjqlwKaDBOq2kvaEUSKJpWINaBQD/fsw4WajhL27DgZWC4WzQmYxqL4E5CTYnUYAwdxN0mLMMWcA0gXOsE1pvqL0Trwz1hF5lNxPa6uE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718723313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3aMP3hI8Hr8X0uab1F9+FYqi8PnbUoh/vitPu8CW9f8=; b=NvggSCxuK3bnlZAUkH0eatdsrBfnxE3lURMibCXDcn3TGzVNY4iwjGPnhUCaM4MmrQcRYr BO1nmbwGyEtWIITwHFcugKKQZJGxA7wmYk283jIhLYv5ax7mRu/MgGQea8BKZMWFPyHtZq ahdoS/OOb+f2raX4RriXQn9bXd/Fdwk= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-677-U1YJWVfWP9mTHlqqw8pN2A-1; Tue, 18 Jun 2024 11:08:31 -0400 X-MC-Unique: U1YJWVfWP9mTHlqqw8pN2A-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DBDC31955E7E for ; Tue, 18 Jun 2024 15:08:30 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.10.107]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0356C1956054; Tue, 18 Jun 2024 15:08:29 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 7/7] diagnostics: rename tree-diagnostic-path.cc to diagnostic-path.cc Date: Tue, 18 Jun 2024 11:08:19 -0400 Message-Id: <20240618150819.946820-8-dmalcolm@redhat.com> In-Reply-To: <20240618150819.946820-1-dmalcolm@redhat.com> References: <20240618150819.946820-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Now that nothing in tree-diagnostic-path.cc uses "tree", this patch renames it to diagnostic-path.cc and moves it from OBJS to OBJS-libcommon. No functional change intended. gcc/ChangeLog: * Makefile.in (OBJS): Move selftest-diagnostic-path.o, selftest-logical-location.o, and tree-diagnostic-path.o to... (OBJS-libcommon): ...here, renaming tree-diagnostic-path.o to diagnostic-path.o. * tree-diagnostic-path.cc: Rename to... * diagnostic-path.cc: ...this. Drop include of "tree.h". (tree_diagnostic_path_cc_tests): Rename to... (diagnostic_path_cc_tests): ...this. * selftest-run-tests.cc (selftest::run_tests): Update for above renaming. * selftest.h (tree_diagnostic_path_cc_tests): Rename decl to... (diagnostic_path_cc_tests): ...this. Signed-off-by: David Malcolm --- gcc/Makefile.in | 6 +++--- gcc/{tree-diagnostic-path.cc => diagnostic-path.cc} | 3 +-- gcc/selftest-run-tests.cc | 2 +- gcc/selftest.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) rename gcc/{tree-diagnostic-path.cc => diagnostic-path.cc} (99%) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index e701d9fb082..638ea6b2307 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1700,8 +1700,6 @@ OBJS = \ ubsan.o \ sanopt.o \ sancov.o \ - selftest-diagnostic-path.o \ - selftest-logical-location.o \ simple-diagnostic-path.o \ tree-call-cdce.o \ tree-cfg.o \ @@ -1712,7 +1710,6 @@ OBJS = \ tree-dfa.o \ tree-diagnostic.o \ tree-diagnostic-client-data-hooks.o \ - tree-diagnostic-path.o \ tree-dump.o \ tree-eh.o \ tree-emutls.o \ @@ -1827,6 +1824,7 @@ OBJS-libcommon = diagnostic-spec.o diagnostic.o diagnostic-color.o \ diagnostic-format-json.o \ diagnostic-format-sarif.o \ diagnostic-macro-unwinding.o \ + diagnostic-path.o \ diagnostic-show-locus.o \ edit-context.o \ pretty-print.o intl.o \ @@ -1834,6 +1832,8 @@ OBJS-libcommon = diagnostic-spec.o diagnostic.o diagnostic-color.o \ sbitmap.o \ vec.o input.o hash-table.o ggc-none.o memory-block.o \ selftest.o selftest-diagnostic.o sort.o \ + selftest-diagnostic-path.o \ + selftest-logical-location.o \ text-art/box-drawing.o \ text-art/canvas.o \ text-art/ruler.o \ diff --git a/gcc/tree-diagnostic-path.cc b/gcc/diagnostic-path.cc similarity index 99% rename from gcc/tree-diagnostic-path.cc rename to gcc/diagnostic-path.cc index 35f8ea2b8b6..882dc1c5805 100644 --- a/gcc/tree-diagnostic-path.cc +++ b/gcc/diagnostic-path.cc @@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see #define INCLUDE_VECTOR #include "system.h" #include "coretypes.h" -#include "tree.h" #include "diagnostic.h" #include "diagnostic-macro-unwinding.h" #include "intl.h" @@ -2199,7 +2198,7 @@ control_flow_tests (const line_table_case &case_) /* Run all of the selftests within this file. */ void -tree_diagnostic_path_cc_tests () +diagnostic_path_cc_tests () { /* In a few places we use the global dc's printer to determine colorization so ensure this off during the tests. */ diff --git a/gcc/selftest-run-tests.cc b/gcc/selftest-run-tests.cc index 3275db38ba9..e6779206c47 100644 --- a/gcc/selftest-run-tests.cc +++ b/gcc/selftest-run-tests.cc @@ -102,7 +102,7 @@ selftest::run_tests () spellcheck_cc_tests (); spellcheck_tree_cc_tests (); tree_cfg_cc_tests (); - tree_diagnostic_path_cc_tests (); + diagnostic_path_cc_tests (); simple_diagnostic_path_cc_tests (); attribs_cc_tests (); diff --git a/gcc/selftest.h b/gcc/selftest.h index 2d1aa91607e..dcb1463ed90 100644 --- a/gcc/selftest.h +++ b/gcc/selftest.h @@ -222,6 +222,7 @@ extern void cgraph_cc_tests (); extern void convert_cc_tests (); extern void diagnostic_color_cc_tests (); extern void diagnostic_format_json_cc_tests (); +extern void diagnostic_path_cc_tests (); extern void diagnostic_show_locus_cc_tests (); extern void digraph_cc_tests (); extern void dumpfile_cc_tests (); @@ -259,7 +260,6 @@ extern void sreal_cc_tests (); extern void store_merging_cc_tests (); extern void tree_cc_tests (); extern void tree_cfg_cc_tests (); -extern void tree_diagnostic_path_cc_tests (); extern void tristate_cc_tests (); extern void typed_splay_tree_cc_tests (); extern void vec_cc_tests ();