From owner-svn-src-head@FreeBSD.ORG  Sun Feb 22 15:51:51 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 26FB264C;
 Sun, 22 Feb 2015 15:51:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F02E173;
 Sun, 22 Feb 2015 15:51:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1MFpoZ6009367;
 Sun, 22 Feb 2015 15:51:50 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1MFpoCn009366;
 Sun, 22 Feb 2015 15:51:50 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201502221551.t1MFpoCn009366@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 22 Feb 2015 15:51:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279161 - head/contrib/llvm/lib/Transforms/Scalar
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Feb 2015 15:51:51 -0000

Author: dim
Date: Sun Feb 22 15:51:49 2015
New Revision: 279161
URL: https://svnweb.freebsd.org/changeset/base/279161

Log:
  Pull in r230058 from upstream llvm trunk (by Benjamin Kramer):
  
    LoopRotate: When reconstructing loop simplify form don't split edges
    from indirectbrs.
  
    Yet another chapter in the endless story. While this looks like we
    leave the loop in a non-canonical state this replicates the logic in
    LoopSimplify so it doesn't diverge from the canonical form in any way.
  
    http://llvm.org/PR21968
  
  This fixes a "Cannot split critical edge from IndirectBrInst" assertion
  failure when building the devel/radare2 port.
  
  PR:		195480, 196987
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp

Modified: head/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp
==============================================================================
--- head/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp	Sun Feb 22 15:48:36 2015	(r279160)
+++ head/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp	Sun Feb 22 15:51:49 2015	(r279161)
@@ -498,6 +498,8 @@ bool LoopRotate::rotateLoop(Loop *L, boo
       Loop *PredLoop = LI->getLoopFor(*PI);
       if (!PredLoop || PredLoop->contains(Exit))
         continue;
+      if (isa<IndirectBrInst>((*PI)->getTerminator()))
+        continue;
       SplitLatchEdge |= L->getLoopLatch() == *PI;
       BasicBlock *ExitSplit = SplitCriticalEdge(*PI, Exit, this);
       ExitSplit->moveBefore(Exit);