From patchwork Sat Nov 3 19:21:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 196930 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]) by ozlabs.org (Postfix) with SMTP id 373C52C00BE for ; Sun, 4 Nov 2012 06:21:26 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1352575287; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=fHmzVTm ni8kFsu+DBUthJ3Dv9u0=; b=FAKvlLRRrSxbYsH49wawoTQ6004qeax/BiLuBCZ yN5wYtTj9DKKI2ri9Q3RgDCqiQiZfew4srv2q0xZd/syKDyUik5UjyCL8QgTIIIe 76/R9rl0sWEBx+qH/yJfdGRboEgpCu+k/1tvRo0hLbY1e2ajPZIjAFnzYTSZXiCA Gssk= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=EYEzx+MVN+CEo4fyiyuwqPaVhwzV2S73pCm26jdm34sWeKQIZmxi/nURzBSMDd kVu9cHliel6lbbLI1QMRtMM7R7tb4mpZxrFRN91OXZ8KtRVpjNO30QNGLVk9rPd0 KcRn4NogKWhAQWGH7JhF1DUxYZsxckcWF/xlIPCaTaYJw=; Received: (qmail 2179 invoked by alias); 3 Nov 2012 19:21:21 -0000 Received: (qmail 2169 invoked by uid 22791); 3 Nov 2012 19:21:20 -0000 X-SWARE-Spam-Status: No, hits=-4.7 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-we0-f175.google.com (HELO mail-we0-f175.google.com) (74.125.82.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 03 Nov 2012 19:21:15 +0000 Received: by mail-we0-f175.google.com with SMTP id t44so2163745wey.20 for ; Sat, 03 Nov 2012 12:21:14 -0700 (PDT) MIME-Version: 1.0 Received: by 10.180.19.197 with SMTP id h5mr7142772wie.22.1351970474403; Sat, 03 Nov 2012 12:21:14 -0700 (PDT) Received: by 10.217.64.194 with HTTP; Sat, 3 Nov 2012 12:21:14 -0700 (PDT) Date: Sat, 3 Nov 2012 12:21:14 -0700 Message-ID: Subject: [Committed] Fix gcc.target/mips/octeon-bbit-3.c testcase From: Andrew Pinski To: GCC Patches X-IsSubscribed: yes 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 Hi, After some of the recent patches which does cross jumping at the tree level (tail merge) and the patch for tree-ssa-ifcombine, this testcase fails as we merge the if statements that lead to abort. This patch fixes the problem by changing one of the calls to abort to call a different function (abort1). Committed as obvious after testing on mips64-linux-gnu that the testcase passes now. Thanks, Andrew Pinski * gcc.target/mips/octeon-bbit-3.c: Change the second call to abort to call abort1 so that cross jumping does not happen. Index: testsuite/gcc.target/mips/octeon-bbit-3.c =================================================================== --- testsuite/gcc.target/mips/octeon-bbit-3.c (revision 193124) +++ testsuite/gcc.target/mips/octeon-bbit-3.c (working copy) @@ -18,6 +18,7 @@ /* { dg-final { scan-assembler-not "ext\t" } } */ void abort (void); +void abort1 (void); void exit (int); typedef unsigned long long ulong64; @@ -39,7 +40,7 @@ f () if (bar.a != 0x1) abort (); else if (!bar.c) - abort (); + abort1 (); else exit (0); }