summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2011-07-26 21:02:58 +0000
committerEli Friedman <eli.friedman@gmail.com>2011-07-26 21:02:58 +0000
commit61cc47e15d1899dac5b2633b2e13f9fcd04d3ce9 (patch)
treef5dcd3468f29524a2753db73e3699fb859b17c27
parentbfe3686aee881cb7599c42fc96afc44ff9bcf356 (diff)
downloadllvm-61cc47e15d1899dac5b2633b2e13f9fcd04d3ce9.tar.gz
llvm-61cc47e15d1899dac5b2633b2e13f9fcd04d3ce9.tar.bz2
llvm-61cc47e15d1899dac5b2633b2e13f9fcd04d3ce9.tar.xz
Prevent x86-specific DAGCombine from creating nodes with illegal type (which could not be selected). Fixes a minor isel issue that was breaking the testcase from r136130.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136148 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/X86/X86ISelLowering.cpp3
-rw-r--r--test/CodeGen/X86/split-vector-bitcast.ll3
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 2c62b93f7b..1c87f14ad4 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -4520,7 +4520,8 @@ static SDValue EltsFromConsecutiveLoads(EVT VT, SmallVectorImpl<SDValue> &Elts,
LDBase->getPointerInfo(),
LDBase->isVolatile(), LDBase->isNonTemporal(),
LDBase->getAlignment());
- } else if (NumElems == 4 && LastLoadedElt == 1) {
+ } else if (NumElems == 4 && LastLoadedElt == 1 &&
+ DAG.getTargetLoweringInfo().isTypeLegal(MVT::v2i64)) {
SDVTList Tys = DAG.getVTList(MVT::v2i64, MVT::Other);
SDValue Ops[] = { LDBase->getChain(), LDBase->getBasePtr() };
SDValue ResNode = DAG.getMemIntrinsicNode(X86ISD::VZEXT_LOAD, DL, Tys,
diff --git a/test/CodeGen/X86/split-vector-bitcast.ll b/test/CodeGen/X86/split-vector-bitcast.ll
index 79cc1202dc..fae15cfaf2 100644
--- a/test/CodeGen/X86/split-vector-bitcast.ll
+++ b/test/CodeGen/X86/split-vector-bitcast.ll
@@ -1,7 +1,6 @@
; RUN: llc < %s -march=x86 -mattr=-sse2,+sse | grep addps
-; XFAIL: *
-; PR10497
+; PR10497 + another isel issue with sse2 disabled
; (This is primarily checking that this construct doesn't crash.)
define void @a(<2 x float>* %a, <2 x i32>* %b) {
%cc = load <2 x float>* %a