From: Dan Gohman Date: Fri, 16 Apr 2010 20:22:43 +0000 (+0000) Subject: Commit this, which should have accompanied 101531. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4bcf0a9233e334532d86111829375f73776984ad;p=oota-llvm.git Commit this, which should have accompanied 101531. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101532 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 1afb41801cc..c3adab26109 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -3223,7 +3223,8 @@ static bool FindOptimalMemOpLowering(std::vector &MemOps, // indicates whether the memcpy source is constant so it does not need to be // loaded. EVT VT = TLI.getOptimalMemOpType(Size, DstAlign, SrcAlign, - NonScalarIntSafe, MemcpyStrSrc, DAG); + NonScalarIntSafe, MemcpyStrSrc, + DAG.getMachineFunction()); if (VT == MVT::Other) { if (DstAlign >= TLI.getTargetData()->getPointerPrefAlignment() ||