From patchwork Tue Nov 24 04:37:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeff Law X-Patchwork-Id: 1405226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=NWdj28jw; dkim-atps=neutral Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CgB7t0tJ6z9sRK for ; Tue, 24 Nov 2020 15:37:12 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B39453857021; Tue, 24 Nov 2020 04:37:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B39453857021 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1606192629; bh=81uZgVaCX6tpiD/PolinTOCTqneilRfjHlI/K/1A/Q0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=NWdj28jw5+VKSErdWUgHpVuawq1RaSZSRoEGPPbFe9FBZePKp27Za9tLPTQEz1onG CKTFr+fCi5296EbNazD0RUtsXppMeUO4A8UF1BWm14J0nEBrpgaRm7DlFrEtmND2KF IIgp3gSrCIF2tikEYPVbeZK3UVUjEuFT5wMjZXXw= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 869273857C5A for ; Tue, 24 Nov 2020 04:37:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 869273857C5A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-Wc8pn8fZO_yjntn__omZKw-1; Mon, 23 Nov 2020 23:37:03 -0500 X-MC-Unique: Wc8pn8fZO_yjntn__omZKw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD5801823DD5 for ; Tue, 24 Nov 2020 04:37:02 +0000 (UTC) Received: from localhost.localdomain (ovpn-113-152.phx2.redhat.com [10.3.113.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80CD45D6A1 for ; Tue, 24 Nov 2020 04:37:02 +0000 (UTC) To: GCC Patches Subject: [committed] Fix expected output after recent dump output changes Message-ID: Date: Mon, 23 Nov 2020 21:37:02 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-11.5 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, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Jeff Law via Gcc-patches From: Jeff Law Reply-To: Jeff Law Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Martin's recent changes added the return type to the dump file.  Naturally we have tests that count "int" or pointers, which can show up in the return type. This patch adjusts the tests to the current output.   Pushed to the trunk. Jeff commit 4cd35cf3fdb70e2107f6b059f638f5bde4dae1c3 Author: Jeff Law Date: Mon Nov 23 21:34:24 2020 -0700 Fix expected output after recent changes gcc/testsuite * gcc.dg/tree-ssa/pr23401.c: Update expected output. * gcc.dg/tree-ssa/pr27810.c: Update expected output. * gcc.dg/tree-ssa/slsr-8.c: Update expected output. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c index fb8aebff525..a93fcaf8770 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c @@ -19,5 +19,5 @@ int ffff(int i) /* We should not use extra temporaries apart from for i1 + i2. */ -/* { dg-final { scan-tree-dump-times "int" 5 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "int" 6 "gimple" } } */ /* { dg-final { scan-tree-dump-times "int D\\\." 1 "gimple" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c b/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c index 84dfcc9ed91..5c1945bb5c1 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c @@ -13,5 +13,5 @@ int qqq (int a) /* We should not use an extra temporary for the result of the function call. */ -/* { dg-final { scan-tree-dump-times "int" 3 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "int" 4 "gimple" } } */ /* { dg-final { scan-tree-dump-times "int D\\\." 1 "gimple" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-8.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-8.c index 585b660886b..479f40f93de 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-8.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-8.c @@ -23,7 +23,7 @@ f (int s, int *c, int *d) However, this proves to be a useful test for introducing an initializer with a cast, so we'll keep it as is. */ -/* There are 4 ' * ' instances in the decls (since "int * iftmp.0;" is - added), 2 parms, 3 in the code. The second one in the code may - be a widening multiply (for example, on AArch64). */ -/* { dg-final { scan-tree-dump-times " w?\\* " 9 "optimized" } } */ +/* There are 5 ' * ' instances in the decls (since "int * iftmp.0;" is + added), 2 parms, 3 in the code, and the return value. The second one + in the code may be a widening multiply (for example, on AArch64). */ +/* { dg-final { scan-tree-dump-times " w?\\* " 10 "optimized" } } */