X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=lib%2FCodeGen%2FSelectionDAG%2FDAGCombiner.cpp;h=f119023d217b03ea185eb29990623f5f498b1469;hp=bdcf5a2a89ece0a68e8186b29ed9bd63babf6907;hb=20a42bb20d43b80e322c95dd99b64a5a4566fe08;hpb=59278dfa2316824957b2633f5030103965030643

diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index bdcf5a2a89e..f119023d217 100644
--- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -3101,7 +3101,7 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
 
   // XXX-disabled: (and x, 0) should not be folded.
   // (and (and x, 0), y) shouldn't either.
-  if (!N0C && N1C->isNullValue()) {
+  if (!N0C && N1C && N1C->isNullValue()) {
     return SDValue();
   }
   if (!N0C) {