diff --git a/include/llvm/CodeGen/SelectionDAG.h b/include/llvm/CodeGen/SelectionDAG.h
index ea35e69a486..45dacfffa9a 100644
--- a/include/llvm/CodeGen/SelectionDAG.h
+++ b/include/llvm/CodeGen/SelectionDAG.h
@@ -32,6 +32,7 @@ class AliasAnalysis;
 class TargetLowering;
 class TargetMachine;
 class MachineModuleInfo;
+class DwarfWriter;
 class MachineFunction;
 class MachineConstantPoolValue;
 class FunctionLoweringInfo;
@@ -76,6 +77,7 @@ class SelectionDAG {
   MachineFunction *MF;
   FunctionLoweringInfo &FLI;
   MachineModuleInfo *MMI;
+  DwarfWriter *DW;
 
   /// EntryNode - The starting token.
   SDNode EntryNode;
@@ -122,7 +124,7 @@ public:
   /// init - Prepare this SelectionDAG to process code in the given
   /// MachineFunction.
   ///
-  void init(MachineFunction &mf, MachineModuleInfo *mmi);
+  void init(MachineFunction &mf, MachineModuleInfo *mmi, DwarfWriter *dw);
 
   /// clear - Clear state and free memory necessary to make this
   /// SelectionDAG ready to process a new block.
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 5da693cae88..c755eac9516 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -772,9 +772,11 @@ SelectionDAG::SelectionDAG(TargetLowering &tli, FunctionLoweringInfo &fli)
   AllNodes.push_back(&EntryNode);
 }
 
-void SelectionDAG::init(MachineFunction &mf, MachineModuleInfo *mmi) {
+void SelectionDAG::init(MachineFunction &mf, MachineModuleInfo *mmi,
+                        DwarfWriter *dw) {
   MF = &mf;
   MMI = mmi;
+  DW = dw;
 }
 
 SelectionDAG::~SelectionDAG() {
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 3221de064e3..4eb70198817 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -36,6 +36,7 @@
 #include "llvm/CodeGen/ScheduleDAGSDNodes.h"
 #include "llvm/CodeGen/SchedulerRegistry.h"
 #include "llvm/CodeGen/SelectionDAG.h"
+#include "llvm/CodeGen/DwarfWriter.h"
 #include "llvm/Target/TargetRegisterInfo.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetFrameInfo.h"
@@ -288,6 +289,7 @@ unsigned SelectionDAGISel::MakeReg(MVT VT) {
 void SelectionDAGISel::getAnalysisUsage(AnalysisUsage &AU) const {
   AU.addRequired<AliasAnalysis>();
   AU.addRequired<GCModuleInfo>();
+  AU.addRequired<DwarfWriter>();
   AU.setPreservesAll();
 }
 
@@ -316,7 +318,8 @@ bool SelectionDAGISel::runOnFunction(Function &Fn) {
 
   FuncInfo->set(Fn, MF, EnableFastISel);
   MachineModuleInfo *MMI = getAnalysisToUpdate<MachineModuleInfo>();
-  CurDAG->init(MF, MMI);
+  DwarfWriter *DW = getAnalysisToUpdate<DwarfWriter>();
+  CurDAG->init(MF, MMI, DW);
   SDL->init(GFI, *AA);
 
   for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)