From patchwork Tue Oct 15 15:06:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1997523 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=S8s03zHb; 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 4XScs01lF0z1xsc for ; Wed, 16 Oct 2024 02:07:16 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6790A3857719 for ; Tue, 15 Oct 2024 15:07:14 +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.133.124]) by sourceware.org (Postfix) with ESMTP id 65E843858C42 for ; Tue, 15 Oct 2024 15:06:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 65E843858C42 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 65E843858C42 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729004815; cv=none; b=KyZU7KQJ/4OFV9OLOxupBJbEHL/MG3x71qu9hCVzBeZwIaLlZ4T0t958F04kEriTtE79oHAPvg17Hcib7wxF3FYifu+QTX0TruodaMX8LFLZBsSmdXNlnqbSOHNTdeol9eIy4E9yoyuF0weqrpqlkwTJisP6AMbyhQUPy0/w08Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729004815; c=relaxed/simple; bh=YpI4u0VPfWR/FYnLIKvRhNOsWZMBiPU7rm4oI2QQqM4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Bb7zqDxcqCzLcHcmT/pkDNA7rbCrVpxJHgb/HjO/L6OknqizqYQ5NUVeKPFjfc4/qPm7uj+Si9qhhFPXw4rNvHY4Ca6Udwr/9zh/W+WbV+Wi5qklmZt+wEt5e0PM0CZAEQ/IiIxTuStWUt7Vb1LlKQBE2/XXzO6oWeahcNCMKZo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729004804; 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; bh=FF9JJELFOXu41T9lwLRmjTMTNgGg1bRVvHrEYR9KL8A=; b=S8s03zHbpiyoYTMpqsz2zhm5DfMZ143dIwi9q6OnSVAoirqdCp95MFupsxOXX274cPNRIo UrnIdNQ7GtmqLYO9E7iXDoWoGtFV1TwxDFTJTNxF4JbiXpz16fcafeuD6UtuXnNYJMhdd1 rNkkBoig6/wBiZBIfWB37qNzuVJFriU= 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-642-6rrCuzlzMRKNP6RDblYwQw-1; Tue, 15 Oct 2024 11:06:41 -0400 X-MC-Unique: 6rrCuzlzMRKNP6RDblYwQw-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 B04E31955F42 for ; Tue, 15 Oct 2024 15:06:39 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.64.110]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F0CB11956086; Tue, 15 Oct 2024 15:06:38 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed: r15-4361] testsuite: simplify analyzer_cpython_plugin.c Date: Tue, 15 Oct 2024 11:06:37 -0400 Message-ID: <20241015150637.564162-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.1 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_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_NONE, 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 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 No functional change intended. Successfully regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r15-4361-g77076d85e9aa5e. gcc/testsuite/ChangeLog: * gcc.dg/plugin/analyzer_cpython_plugin.c: Use success_call_info in a couple of places to avoid reimplementing get_desc. Signed-off-by: David Malcolm --- .../gcc.dg/plugin/analyzer_cpython_plugin.c | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/gcc/testsuite/gcc.dg/plugin/analyzer_cpython_plugin.c b/gcc/testsuite/gcc.dg/plugin/analyzer_cpython_plugin.c index d0fe110f20e9..c1510e441e6f 100644 --- a/gcc/testsuite/gcc.dg/plugin/analyzer_cpython_plugin.c +++ b/gcc/testsuite/gcc.dg/plugin/analyzer_cpython_plugin.c @@ -963,17 +963,10 @@ public: void kf_PyList_New::impl_call_post (const call_details &cd) const { - class success : public call_info + class success : public success_call_info { public: - success (const call_details &cd) : call_info (cd) {} - - label_text - get_desc (bool can_colorize) const final override - { - return make_label_text (can_colorize, "when %qE succeeds", - get_fndecl ()); - } + success (const call_details &cd) : success_call_info (cd) {} bool update_model (region_model *model, const exploded_edge *, @@ -1104,17 +1097,10 @@ public: void kf_PyLong_FromLong::impl_call_post (const call_details &cd) const { - class success : public call_info + class success : public success_call_info { public: - success (const call_details &cd) : call_info (cd) {} - - label_text - get_desc (bool can_colorize) const final override - { - return make_label_text (can_colorize, "when %qE succeeds", - get_fndecl ()); - } + success (const call_details &cd) : success_call_info (cd) {} bool update_model (region_model *model, const exploded_edge *,