[llvm-commits] [llvm] r88761 - in /llvm/trunk/lib: CodeGen/AsmPrinter/AsmPrinter.cpp Target/PIC16/PIC16DebugInfo.cpp

[Sanjiv Gupta]

Author: sgupta
Date: Sat Nov 14 00:19:49 2009
New Revision: 88761

URL: http://llvm.org/viewvc/llvm-project?rev=88761&view=rev
Log:
Fix debug info crashes for PIC16.

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/trunk/lib/Target/PIC16/PIC16DebugInfo.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=88761&r1=88760&r2=88761&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Sat Nov 14 00:19:49 2009
@@ -138,7 +138,7 @@
   if (MMI)
     MMI->AnalyzeModule(M);
   DW = getAnalysisIfAvailable<DwarfWriter>();
-  if (DW)
+  if (DW && MAI->doesSupportDebugInformation())
     DW->BeginModule(&M, MMI, O, this, MAI);
 
   return false;

Modified: llvm/trunk/lib/Target/PIC16/PIC16DebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16DebugInfo.cpp?rev=88761&r1=88760&r2=88761&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PIC16/PIC16DebugInfo.cpp (original)
+++ llvm/trunk/lib/Target/PIC16/PIC16DebugInfo.cpp Sat Nov 14 00:19:49 2009
@@ -467,12 +467,18 @@
 void PIC16DbgInfo::SwitchToCU(MDNode *CU) {
   // Get the file path from CU.
   DICompileUnit cu(CU);
-  std::string DirName = cu.getDirectory();
-  std::string FileName = cu.getFilename();
-  std::string FilePath = DirName + "/" + FileName;
+  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;
+  }
 
-  // Nothing to do if source file is still same.
-  if ( FilePath == CurFile ) return;
+  // Nothing to do if source file is still same or it is empty.
+  if ( FilePath == CurFile || FilePath == "") return;
 
   // Else, close the current one and start a new.
   if (CurFile != "") O << "\n\t.eof";