diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 6d660a60c3e6..7c5c23b268ff 100644
--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -138,7 +138,7 @@ bool AsmPrinter::doInitialization(Module &M) {
   if (MMI)
     MMI->AnalyzeModule(M);
   DW = getAnalysisIfAvailable<DwarfWriter>();
-  if (DW && MAI->doesSupportDebugInformation())
+  if (DW)
     DW->BeginModule(&M, MMI, O, this, MAI);
 
   return false;
diff --git a/llvm/lib/Target/PIC16/PIC16DebugInfo.cpp b/llvm/lib/Target/PIC16/PIC16DebugInfo.cpp
index 49df457af7e0..0ed44d21fc40 100644
--- a/llvm/lib/Target/PIC16/PIC16DebugInfo.cpp
+++ b/llvm/lib/Target/PIC16/PIC16DebugInfo.cpp
@@ -467,18 +467,12 @@ void PIC16DbgInfo::EmitVarDebugInfo(Module &M) {
 void PIC16DbgInfo::SwitchToCU(MDNode *CU) {
   // Get the file path from CU.
   DICompileUnit cu(CU);
-  std::string FilePath = "";
-  if (cu.getDirectory()) {
-    std::string DirName = cu.getDirectory();
-    FilePath = FilePath + DirName + "/";
-  }
-  if (cu.getFilename()) {
-    std::string FileName = cu.getFilename();
-    FilePath = FilePath + FileName;
-  }
+  std::string DirName = cu.getDirectory();
+  std::string FileName = cu.getFilename();
+  std::string FilePath = DirName + "/" + FileName;
 
-  // Nothing to do if source file is still same or it is empty.
-  if ( FilePath == CurFile || FilePath == "") return;
+  // Nothing to do if source file is still same.
+  if ( FilePath == CurFile ) return;
 
   // Else, close the current one and start a new.
   if (CurFile != "") O << "\n\t.eof";