commit 6cb23465e0ccd195efdc4843f753a4d1eb815f5b
author Oliver Stannard <oliver.stannard@arm.com> Mon May 18 16:39:16 2015 +0000
committer Oliver Stannard <oliver.stannard@arm.com> Mon May 18 16:39:16 2015 +0000
tree c1d9fbb8b1acadc6d1f42de043eb19aea917975b
parent f7e7017281738ac64bb137d8900f96fe9c7fbc21

Revert r237579, as it broke windows buildbots

llvm-svn: 237583

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index d4f69e8..3c5d32f 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -4054,9 +4054,10 @@
   case Intrinsic::write_register: {
     Value *Reg = I.getArgOperand(0);
     Value *RegValue = I.getArgOperand(1);
+    SDValue Chain = getValue(RegValue).getOperand(0);
     SDValue RegName =
         DAG.getMDNode(cast<MDNode>(cast<MetadataAsValue>(Reg)->getMetadata()));
-    DAG.setRoot(DAG.getNode(ISD::WRITE_REGISTER, sdl, MVT::Other, getRoot(),
+    DAG.setRoot(DAG.getNode(ISD::WRITE_REGISTER, sdl, MVT::Other, Chain,
                             RegName, getValue(RegValue)));
     return nullptr;
   }