From patchwork Wed Dec 7 02:04:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 703401 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tYLYr0lDXz9sCg for ; Wed, 7 Dec 2016 12:31:25 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Q/ZyB7R8"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=uwOH90sL6/xE 9KWOsmOa0+5zpw6CKxpyEcIbSJz7HWD/L0nQN56QlxkzR6kxy40Rym0aPTacBwRF XG7E/AQ/vwQVHyTH87TjZ1lEE8Ej5z2687HjmytsrqRC/9WITxyQDa6CmgptkFTP CG21lHuFrnjlLX+k1I+qm9EFwkw68N0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; s=default; bh=rIG/ESePfrDB/QTRDy ZQrIXOxzE=; b=Q/ZyB7R8zrCspzPgVOJerRu8n3LXoV4GynaZNP8BbXgLG8nme4 Oi6TA7le8OZWLBeUAdMDKS+EW8ptJjXagx7xuP1SOhPH4dsUEkP4BaDtlKG0us/1 +gSYIq4ZNHp2di6V0XmwMKCSWIRNWyn5CMo3anYcBV/VJrdmQpNPdbg+c= Received: (qmail 72330 invoked by alias); 7 Dec 2016 01:31:16 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 72311 invoked by uid 89); 7 Dec 2016 01:31:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1579, dumped X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 07 Dec 2016 01:31:14 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5D95FC05B1CE for ; Wed, 7 Dec 2016 01:31:13 +0000 (UTC) Received: from c64.redhat.com (vpn-228-31.phx2.redhat.com [10.3.228.31]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB71VC4F006209; Tue, 6 Dec 2016 20:31:12 -0500 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [committed] Fix x86_64-ism in selftest (PR bootstrap/78705) Date: Tue, 6 Dec 2016 21:04:12 -0500 Message-Id: <1481076252-25506-1-git-send-email-dmalcolm@redhat.com> X-IsSubscribed: yes In r243317 I accidentally introduced an assumption in a selftest in i386.c that Pmode == DImode. This patch conditionalizes the overzealous string comparison to avoid breaking the build on 32-bit i386.c targets. Committed to trunk as r243332 as obvious. Sorry about the breakage. gcc/ChangeLog: PR bootstrap/78705 * config/i386/i386.c (selftest::ix86_test_dumping_memory_blockage): Conditionalize the string comparison on Pmode == DImode. --- gcc/config/i386/i386.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 2e6be02..1cd1cd8 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -51190,12 +51190,14 @@ ix86_test_dumping_memory_blockage () /* Verify that the repeated references to the SCRATCH show use reuse IDS. The first should be prefixed with a reuse ID, - and the second should be dumped as a "reuse_rtx" of that ID. */ - ASSERT_RTL_DUMP_EQ_WITH_REUSE - ("(cinsn 1 (set (mem/v:BLK (0|scratch:DI) [0 A8])\n" - " (unspec:BLK [\n" - " (mem/v:BLK (reuse_rtx 0) [0 A8])\n" - " ] UNSPEC_MEMORY_BLOCKAGE)))\n", pat, &r); + and the second should be dumped as a "reuse_rtx" of that ID. + The expected string assumes Pmode == DImode. */ + if (Pmode == DImode) + ASSERT_RTL_DUMP_EQ_WITH_REUSE + ("(cinsn 1 (set (mem/v:BLK (0|scratch:DI) [0 A8])\n" + " (unspec:BLK [\n" + " (mem/v:BLK (reuse_rtx 0) [0 A8])\n" + " ] UNSPEC_MEMORY_BLOCKAGE)))\n", pat, &r); } /* Run all target-specific selftests. */