[llvm-commits] [llvm-gcc-4.2] r109536 - /llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

[Devang Patel]

Author: dpatel
Date: Tue Jul 27 15:50:43 2010
New Revision: 109536

URL: http://llvm.org/viewvc/llvm-project?rev=109536&view=rev
Log:
Always use current working directory as an DW_AT_comp_dir value.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=109536&r1=109535&r2=109536&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Tue Jul 27 15:50:43 2010
@@ -1381,14 +1381,6 @@
       FullPath = main_input_filename;
   }
 
-  // Get source file information.
-  llvm::StringRef Dir;
-  if (FullPath[0] != '/') {
-    if (CWD.empty())
-      CWD = std::string(get_src_pwd());
-    Dir = llvm::StringRef(CWD);
-  }
-
   // Set up Language number.
   unsigned LangTag;
   const std::string LanguageName(lang_hooks.name);
@@ -1424,7 +1416,7 @@
   if (flag_objc_abi != 0 && flag_objc_abi != -1)
     ObjcRunTimeVer = flag_objc_abi;
   return DebugFactory.CreateCompileUnit(LangTag, FullPath,
-                                        Dir,
+                                        get_src_pwd(),
                                         version_string, isMain,
                                         optimize, Flags,
                                         ObjcRunTimeVer);
@@ -1439,14 +1431,7 @@
       FullPath = main_input_filename;
   }
 
-  // Get source file information.
-  llvm::StringRef Dir;
-  if (FullPath[0] != '/') {
-    if (CWD.empty())
-      CWD = std::string(get_src_pwd());
-    Dir = llvm::StringRef(CWD);
-  }
-  return DebugFactory.CreateFile(FullPath, Dir, TheCU);
+  return DebugFactory.CreateFile(FullPath, get_src_pwd(), TheCU);
 }
 
 /* LLVM LOCAL end (ENTIRE FILE!)  */