ports/devel/llvm70/files/patch-head-r342593.diff
Brooks Davis 21bae5bc77 Backport two Objective-C bug fixes (D18672)
Add patches for head rS342592 and rS342593 (D18691)

Add patch files for head rS342592 and rS342593, which correspond to the
following upstream revisions:

https://reviews.llvm.org/rL342397
https://reviews.llvm.org/rL342397

These fix an 'Assertion failed: ((VT.getVectorNumElements() +
N2C->getZExtValue() <= N1.getValueType().getVectorNumElements()) &&
"Extract subvector overflow!"), function getNode' when building the
multimedia/aom port (with AVX2 enabled).

PR:		234480
Submitted by:	theraven, dim
Differential Revision:	https://reviews.freebsd.org/D18672
Differential Revision:	https://reviews.freebsd.org/D18691
2019-01-03 18:10:20 +00:00

21 lines
934 B
Diff

r342593 | dim | 2018-12-29 16:21:51 +0100 (Sat, 29 Dec 2018) | 8 lines
Pull in r342863 from upstream llvm trunk (by Hans Wennborg):
Remove debug printf leftover from r342397
PR: 234480
Index: lib/CodeGen/SelectionDAG/DAGCombiner.cpp
===================================================================
--- lib/CodeGen/SelectionDAG/DAGCombiner.cpp (revision 342592)
+++ lib/CodeGen/SelectionDAG/DAGCombiner.cpp (revision 342593)
@@ -13738,8 +13738,6 @@ bool DAGCombiner::MergeStoresOfConstantsOrVecElts(
((uint64_t)IdxC * MemVT.getVectorNumElements()) / Elts;
Idx = DAG.getConstant(NewIdx, SDLoc(Val), Idx.getValueType());
}
- if (!MemVT.isVector() && Val.getValueType().isVector())
- dbgs() << "hit!\n";
EVT NewVecTy =
EVT::getVectorVT(*DAG.getContext(), MemVTScalarTy, Elts);
Vec = DAG.getBitcast(NewVecTy, Vec);