diff options
author | Pete Cooper <peter_cooper@apple.com> | 2013-02-12 03:14:50 +0000 |
---|---|---|
committer | Pete Cooper <peter_cooper@apple.com> | 2013-02-12 03:14:50 +0000 |
commit | 10a3ae70393155fcb1bb009edb63b1143799b377 (patch) | |
tree | d1d87806164e5cf28afb5dd09119b2e0f4b32446 /llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | |
parent | 89aef93841a76a05199a8c7684e00915bd9593ab (diff) | |
download | bcm5719-llvm-10a3ae70393155fcb1bb009edb63b1143799b377.tar.gz bcm5719-llvm-10a3ae70393155fcb1bb009edb63b1143799b377.zip |
Check type for legality before forming a select from loads.
Sorry for the lack of a test case. I tried writing one for i386 as i know selects are illegal on this target, but they are actually considered legal by isel and expanded later.
I can't see any targets to trigger this, but checking for the legality of a node before forming it is general goodness.
llvm-svn: 174934
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp')
-rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 472919c3e30..5b831499825 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -9400,7 +9400,9 @@ bool DAGCombiner::SimplifySelectOps(SDNode *TheSelect, SDValue LHS, // src value info, don't do the transformation if the memory // locations are not in the default address space. LLD->getPointerInfo().getAddrSpace() != 0 || - RLD->getPointerInfo().getAddrSpace() != 0) + RLD->getPointerInfo().getAddrSpace() != 0 || + !TLI.isOperationLegalOrCustom(TheSelect->getOpcode(), + LLD->getBasePtr().getValueType())) return false; // Check that the select condition doesn't reach either load. If so, |