diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 9001894..3f81268 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3691,6 +3691,13 @@
   if (!isa<Argument>(V))
     return false;
 
+  // Ignore inlined function arguments here.
+  DIVariable DV(Variable);
+  if (DV.getContext().isSubprogram()
+      && DISubprogram(DV.getContext().getNode()).getLinkageName()
+      != cast<Argument>(V)->getParent()->getName())
+    return false;
+
   MachineFunction &MF = DAG.getMachineFunction();
   MachineBasicBlock *MBB = FuncInfo.MBBMap[DI.getParent()];
   if (MBB != &MF.front())