From owner-svn-src-projects@freebsd.org  Sat Jan 16 17:57:55 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id ACEC1A85B13
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat, 16 Jan 2016 17:57:55 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 6996B1875;
 Sat, 16 Jan 2016 17:57:55 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0GHvs60053186;
 Sat, 16 Jan 2016 17:57:54 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0GHvsH1053185;
 Sat, 16 Jan 2016 17:57:54 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201601161757.u0GHvsH1053185@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 16 Jan 2016 17:57:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r294175 - in projects/clang380-import/contrib/llvm:
 lib/Transforms/Vectorize patches
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jan 2016 17:57:55 -0000

Author: dim
Date: Sat Jan 16 17:57:54 2016
New Revision: 294175
URL: https://svnweb.freebsd.org/changeset/base/294175

Log:
  Undo r289072, which reverted upstream llvm trunk r240144.  This is going
  to be fixed for real by importing upstream llvm trunk r257902.

Deleted:
  projects/clang380-import/contrib/llvm/patches/patch-07-undo-llvm-r240144-iostream-sigbus.diff
Modified:
  projects/clang380-import/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Modified: projects/clang380-import/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp	Sat Jan 16 17:56:06 2016	(r294174)
+++ projects/clang380-import/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp	Sat Jan 16 17:57:54 2016	(r294175)
@@ -1691,8 +1691,10 @@ bool BoUpSLP::isFullyVectorizableTinyTre
   if (VectorizableTree.size() != 2)
     return false;
 
-  // Handle splat stores.
-  if (!VectorizableTree[0].NeedToGather && isSplat(VectorizableTree[1].Scalars))
+  // Handle splat and all-constants stores.
+  if (!VectorizableTree[0].NeedToGather &&
+      (allConstant(VectorizableTree[1].Scalars) ||
+       isSplat(VectorizableTree[1].Scalars)))
     return true;
 
   // Gathering cost would be too much for tiny trees.