summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG
diff options
context:
space:
mode:
authorPatrik Hagglund <patrik.h.hagglund@ericsson.com>2014-08-08 08:21:19 +0000
committerPatrik Hagglund <patrik.h.hagglund@ericsson.com>2014-08-08 08:21:19 +0000
commitb0e86ec814582f8577299c63d31f3d2513586ee2 (patch)
tree0ad61cf8f10ba45411550e2330723137f3c24e22 /llvm/lib/CodeGen/SelectionDAG
parentb0b08a0cca01b3440bc67b2168d038017de185f8 (diff)
downloadbcm5719-llvm-b0e86ec814582f8577299c63d31f3d2513586ee2.tar.gz
bcm5719-llvm-b0e86ec814582f8577299c63d31f3d2513586ee2.zip
[pr19635] Revert most of r170537, and add new testcase.
Patch provided by Andrey Kuharev. Sorry, r170537 was obviously wrong. llvm-svn: 215190
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index c88aad66934..6b3beb006af 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -1244,7 +1244,7 @@ void SelectionDAGBuilder::visitRet(const ReturnInst &I) {
ExtendKind = ISD::ZERO_EXTEND;
if (ExtendKind != ISD::ANY_EXTEND && VT.isInteger())
- VT = TLI->getTypeForExtArgOrReturn(VT.getSimpleVT(), ExtendKind);
+ VT = TLI->getTypeForExtArgOrReturn(*DAG.getContext(), VT, ExtendKind);
unsigned NumParts = TLI->getNumRegisters(*DAG.getContext(), VT);
MVT PartVT = TLI->getRegisterType(*DAG.getContext(), VT);
OpenPOWER on IntegriCloud