From patchwork Fri Jul 21 00:32:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 123501 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3466027vqt; Thu, 20 Jul 2023 17:34:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlETwL5X5gcUiZyKlJ0OqYvaI86cQeT9HLUZ3DCB35+iCW4B6DAxvsds3M8B6MRdpVu+hjKu X-Received: by 2002:a05:6512:b0f:b0:4fb:7c40:9f95 with SMTP id w15-20020a0565120b0f00b004fb7c409f95mr178564lfu.47.1689899667384; Thu, 20 Jul 2023 17:34:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689899667; cv=none; d=google.com; s=arc-20160816; b=bYqQmoIEmdjVW39853WZHKJiYC83n6GfyjaZe3CadzrKDmun18bmOBw8OuCzNNdt0J Jb5+4vDGywiTqHUnvgcEfh7Z5xeiPKknoD/vGZfhRPh4hmDi+ZpCbx45jMQHrYBw2B9c fhmjx6Oj6tjvA3izFpyfPO1OrRVP2adL78FvKMatEruDk3eEn8bp3VxkIHKzUGdFWYfe 3bSi2/QWUeXEyzGDmjkiBdKnG94Ea7fPsgkaVZItLhtyvya9brI1rnXPjAN5zfCAnokr lDiJ/lTmVnK+0lMXr6RzGF00D6e2oivI2WILWBZWSPtYNk7O8Uyt3VNacj5aqSQtCcZ1 hj7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=7dkKwwRyj2JLszF+lCClmQOUeMC2c4Tyt+eSfm39MpI=; fh=fa0YJSH7y4k0snNuxsKgOI6vGP7j2f0jR9F1WHC95UA=; b=rc8utoZiHVlKrUb46i0jDmVbB3ZBQcaYVQbbW4q0X0Q1FIIzMiumcRlsztzzYajvS3 HRQZRMC5Sr5GgLdtkdyKv0I89RKWOSDCW0A/P26lTWF1jKsccjaffqcAbPz9vmgDOMLa bgEKDqnE7Sr5f77Dq2unMcruxDNsXdt/fqF4VXzpmhzImBlzu8FPYi2fuF9kmpre/lfK MT9LpDp9TQBxpyRJ29zaasAz6pD4WI2InB3BzHh134vSD7YIauyrWMd6oJreWkRiipVV OzF7mv3pQ4MyBlzMhtoLEi7uw0l8970RiYGnghUUf3R6bDfjjt7XX2eyJIh3PWJQlByB yxpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=qWi5NdN8; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id n7-20020aa7db47000000b00516a1feabc6si1459989edt.657.2023.07.20.17.34.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 17:34:27 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=qWi5NdN8; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DBD6385DC02 for ; Fri, 21 Jul 2023 00:33:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4DBD6385DC02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689899619; bh=7dkKwwRyj2JLszF+lCClmQOUeMC2c4Tyt+eSfm39MpI=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=qWi5NdN8cK5i2IWaQju9zD5YwethexOjan1rjxS779lcr0EhATS9FHU3NE7qwhw1U QZOlRFxtqNPBpx4ifnOCxAnR5kXAgPVYpqi+6j9lTrjpu5kCXzSFzf/qregdLra+Ia QmFNDTqaWJ0RBRrX9jyYNKGmASgppEUfikKfSFtU= 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 3A04738555A4 for ; Fri, 21 Jul 2023 00:32:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3A04738555A4 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-651-ShZGCkWmOCea9AMnokEXug-1; Thu, 20 Jul 2023 20:32:02 -0400 X-MC-Unique: ShZGCkWmOCea9AMnokEXug-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 71C3D185A792 for ; Fri, 21 Jul 2023 00:32:02 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.8.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45DBD1454142; Fri, 21 Jul 2023 00:32:02 +0000 (UTC) To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed] analyzer/text-art: fix clang warnings [PR110433,PR110612] Date: Thu, 20 Jul 2023 20:32:01 -0400 Message-Id: <20230721003201.339666-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.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, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Malcolm via Gcc-patches From: David Malcolm Reply-To: David Malcolm Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771988233438950567 X-GMAIL-MSGID: 1771988233438950567 Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r14-2689-g7006f02bbc3f1d. gcc/analyzer/ChangeLog: PR analyzer/110433 PR middle-end/110612 * access-diagram.cc (class spatial_item): Add virtual dtor. gcc/ChangeLog: PR middle-end/110612 * text-art/table.cc (table_geometry::table_geometry): Drop m_table field. (table_geometry::table_x_to_canvas_x): Add cast to comparison. (table_geometry::table_y_to_canvas_y): Likewise. * text-art/table.h (table_geometry::m_table): Drop unused field. * text-art/widget.h (wrapper_widget::update_child_alloc_rects): Add "override". --- gcc/analyzer/access-diagram.cc | 1 + gcc/text-art/table.cc | 7 +++---- gcc/text-art/table.h | 1 - gcc/text-art/widget.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gcc/analyzer/access-diagram.cc b/gcc/analyzer/access-diagram.cc index 467c9bdd734..d7b669a4e38 100644 --- a/gcc/analyzer/access-diagram.cc +++ b/gcc/analyzer/access-diagram.cc @@ -1125,6 +1125,7 @@ private: class spatial_item { public: + virtual ~spatial_item () {} virtual void add_boundaries (boundaries &out, logger *) const = 0; virtual table make_table (const bit_to_table_map &btm, diff --git a/gcc/text-art/table.cc b/gcc/text-art/table.cc index 71a10246257..2f857a0e2a7 100644 --- a/gcc/text-art/table.cc +++ b/gcc/text-art/table.cc @@ -507,8 +507,7 @@ table_cell_sizes::get_canvas_size (const table::rect_t &rect) const /* class text_art::table_geometry. */ table_geometry::table_geometry (const table &table, table_cell_sizes &cell_sizes) -: m_table (table), - m_cell_sizes (cell_sizes), +: m_cell_sizes (cell_sizes), m_canvas_size (canvas::size_t (0, 0)), m_col_start_x (table.get_size ().w), m_row_start_y (table.get_size ().h) @@ -558,7 +557,7 @@ int table_geometry::table_x_to_canvas_x (int table_x) const { /* Allow one beyond the end, for the right-hand border of the table. */ - if (table_x == m_col_start_x.size ()) + if (table_x == (int)m_col_start_x.size ()) return m_canvas_size.w - 1; return m_col_start_x[table_x]; } @@ -570,7 +569,7 @@ int table_geometry::table_y_to_canvas_y (int table_y) const { /* Allow one beyond the end, for the right-hand border of the table. */ - if (table_y == m_row_start_y.size ()) + if (table_y == (int)m_row_start_y.size ()) return m_canvas_size.h - 1; return m_row_start_y[table_y]; } diff --git a/gcc/text-art/table.h b/gcc/text-art/table.h index 2dc5c3c41cb..17eda912f1a 100644 --- a/gcc/text-art/table.h +++ b/gcc/text-art/table.h @@ -232,7 +232,6 @@ class table_geometry } private: - const table &m_table; table_cell_sizes &m_cell_sizes; canvas::size_t m_canvas_size; diff --git a/gcc/text-art/widget.h b/gcc/text-art/widget.h index 8798e436d94..5156a7ea572 100644 --- a/gcc/text-art/widget.h +++ b/gcc/text-art/widget.h @@ -148,7 +148,7 @@ class wrapper_widget : public widget { return m_child->get_req_size (); } - void update_child_alloc_rects () + void update_child_alloc_rects () override { m_child->set_alloc_rect (get_alloc_rect ()); }