diff options
-rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 16 | ||||
-rw-r--r-- | test/CodeGen/X86/arg-cast.ll | 18 |
2 files changed, 33 insertions, 1 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 76e8d28..e767c28 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -4074,8 +4074,22 @@ TargetLowering::LowerArguments(Function &F, SelectionDAG &DAG) { // Create the node. SDNode *Result = DAG.getNode(ISD::FORMAL_ARGUMENTS, - DAG.getNodeValueTypes(RetVals), RetVals.size(), + DAG.getVTList(&RetVals[0], RetVals.size()), &Ops[0], Ops.size()).Val; + + // Prelower FORMAL_ARGUMENTS. This isn't required for functionality, but + // allows exposing the loads that may be part of the argument access to the + // first DAGCombiner pass. + SDOperand TmpRes = LowerOperation(SDOperand(Result, 0), DAG); + + // The number of results should match up, except that the lowered one may have + // an extra flag result. + assert((Result->getNumValues() == TmpRes.Val->getNumValues() || + (Result->getNumValues()+1 == TmpRes.Val->getNumValues() && + TmpRes.getValue(Result->getNumValues()).getValueType() == MVT::Flag)) + && "Lowering produced unexpected number of results!"); + Result = TmpRes.Val; + unsigned NumArgRegs = Result->getNumValues() - 1; DAG.setRoot(SDOperand(Result, NumArgRegs)); diff --git a/test/CodeGen/X86/arg-cast.ll b/test/CodeGen/X86/arg-cast.ll new file mode 100644 index 0000000..37afbc6 --- /dev/null +++ b/test/CodeGen/X86/arg-cast.ll @@ -0,0 +1,18 @@ +; This should compile to movl $2147483647, %eax + andl only. +; RUN: llvm-as < %s | llc | grep andl +; RUN: llvm-as < %s | llc | not grep movsd +; RUN: llvm-as < %s | llc | not grep esp +; rdar://5736574 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128" +target triple = "i686-apple-darwin8" + +define i32 @foo(double %x) nounwind { +entry: + %x15 = bitcast double %x to i64 ; <i64> [#uses=1] + %tmp713 = lshr i64 %x15, 32 ; <i64> [#uses=1] + %tmp714 = trunc i64 %tmp713 to i32 ; <i32> [#uses=1] + %tmp8 = and i32 %tmp714, 2147483647 ; <i32> [#uses=1] + ret i32 %tmp8 +} + |