diff options
| author | Chris Lattner <sabre@nondot.org> | 2005-12-18 15:36:21 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2005-12-18 15:36:21 +0000 |
| commit | f1a47c3371ecd5bb449f39736a36ebbebd4e9e14 (patch) | |
| tree | f6363d26743191b9a4ef1f2cbc8b58cee5f305b0 /lib/CodeGen | |
| parent | 755dd09815a5f33b68bf3c88b0c7bc6a9672238e (diff) | |
| download | external_llvm-f1a47c3371ecd5bb449f39736a36ebbebd4e9e14.zip external_llvm-f1a47c3371ecd5bb449f39736a36ebbebd4e9e14.tar.gz external_llvm-f1a47c3371ecd5bb449f39736a36ebbebd4e9e14.tar.bz2 | |
More corrections for flagged copyto/from reg
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24828 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index 7b13db8..0521270 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -568,15 +568,17 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { case ISD::CopyFromReg: Tmp1 = LegalizeOp(Node->getOperand(0)); Result = Op.getValue(0); - if (Node->getNumOperands() == 2) { + if (Node->getNumValues() == 2) { if (Tmp1 != Node->getOperand(0)) Result = DAG.getCopyFromReg(Tmp1, cast<RegisterSDNode>(Node->getOperand(1))->getReg(), Node->getValueType(0)); } else { - assert(Node->getNumOperands() == 3 && "Invalid copyfromreg!"); - Tmp2 = LegalizeOp(Node->getOperand(2)); - if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(2)) + assert(Node->getNumValues() == 3 && "Invalid copyfromreg!"); + if (Node->getNumOperands() == 3) + Tmp2 = LegalizeOp(Node->getOperand(2)); + if (Tmp1 != Node->getOperand(0) || + (Node->getNumOperands() == 3 && Tmp2 != Node->getOperand(2))) Result = DAG.getCopyFromReg(Tmp1, cast<RegisterSDNode>(Node->getOperand(1))->getReg(), Node->getValueType(0), Tmp2); @@ -1140,15 +1142,16 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { "Register type must be legal!"); // Legalize the incoming value (must be a legal type). Tmp2 = LegalizeOp(Node->getOperand(2)); - if (Node->getNumOperands() == 3) { + if (Node->getNumValues() == 1) { if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(2)) Result = DAG.getNode(ISD::CopyToReg, MVT::Other, Tmp1, Node->getOperand(1), Tmp2); } else { - assert(Node->getNumOperands() == 4 && "Unknown CopyToReg"); - Tmp3 = LegalizeOp(Node->getOperand(3)); + assert(Node->getNumValues() == 2 && "Unknown CopyToReg"); + if (Node->getNumOperands() == 4) + Tmp3 = LegalizeOp(Node->getOperand(3)); if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(2) || - Tmp3 != Node->getOperand(3)) { + (Node->getNumOperands() == 4 && Tmp3 != Node->getOperand(3))) { unsigned Reg = cast<RegisterSDNode>(Node->getOperand(1))->getReg(); Result = DAG.getCopyToReg(Tmp1, Reg, Tmp2, Tmp3); } |