2 files changed, 3 insertions, 2 deletions
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index bdebcd6eb8..411a0f05fc 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -1512,14 +1512,14 @@ void AsmPrinter::processDebugLoc(const MachineInstr *MI,
     return;
 
   if (BeforePrintingInsn) {
-    if (CurDLT.getNode() != PrevDLT.getNode()) {
+    if (CurDLT.getNode() != PrevDLT) {
       unsigned L = DW->RecordSourceLine(CurDLT.getLineNumber(), 
                                         CurDLT.getColumnNumber(),
                                         CurDLT.getScope().getNode());
       printLabel(L);
       O << '\n';
       DW->BeginScope(MI, L);
-      PrevDLT = CurDLT;
+      PrevDLT = CurDLT.getNode();
     }
   } else {
     // After printing instruction
diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index 85c454085b..1e3e3145a3 100644
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -26,6 +26,7 @@
 #include "llvm/CodeGen/MachineJumpTableInfo.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/Passes.h"
+#include "llvm/Analysis/DebugInfo.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetLowering.h"