commit 6f3b2a670f8f7b5807bf06a8e6a2574e69f58308
author Akira Hatanaka <ahatanaka@mips.com> Sat Jun 02 01:10:34 2012 +0000
committer Akira Hatanaka <ahatanaka@mips.com> Sat Jun 02 01:10:34 2012 +0000
tree 377657f86f4f80c7bf9dbacf03ca3e3cd858e646
parent 58268c23ac92781d499cad8427e29087bb9a9176

Fix a bug in the code which custom-lowers truncating stores in LegalizeDAG.

Check that the SDValue TargetLowering::LowerOperation returns is not null
before replacing the original node with the returned node.

llvm-svn: 157873

llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 7ba7442..c2972b0 100644
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -1312,8 +1312,9 @@
           }
           break;
         case TargetLowering::Custom:
-          ReplaceNode(SDValue(Node, 0),
-                      TLI.LowerOperation(SDValue(Node, 0), DAG));
+          Tmp1 = TLI.LowerOperation(SDValue(Node, 0), DAG);
+          if (Tmp1.getNode())
+            ReplaceNode(SDValue(Node, 0), Tmp1);
           break;
         case TargetLowering::Expand:
           assert(!StVT.isVector() &&