From 28f167699acf28bf6996ea55e89200940bccbf2b Mon Sep 17 00:00:00 2001 From: Devang Patel Date: Fri, 23 Jul 2010 20:38:37 +0000 Subject: [PATCH] There is no need to use separate dir name for AT_comp_dir attribute. Using absolute path for filename allows clients to query complete file location info from gdb breakpoints. Save constructed full file name. llvm-svn: 109263 --- clang/lib/CodeGen/CGDebugInfo.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 753cdcddd28c..7458fa3e6f2a 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -188,18 +188,25 @@ void CGDebugInfo::CreateCompileUnit() { if (MainFileName.empty()) MainFileName = ""; - llvm::sys::Path AbsFileName(MainFileName); - AbsFileName.makeAbsolute(); - // The main file name provided via the "-main-file-name" option contains just // the file name itself with no path information. This file name may have had // a relative path, so we look into the actual file entry for the main // file to determine the real absolute path for the file. - std::string MainFileDir; - if (const FileEntry *MainFile = SM.getFileEntryForID(SM.getMainFileID())) + char *FileNamePtr = NULL; + if (const FileEntry *MainFile = SM.getFileEntryForID(SM.getMainFileID())) { + std::string MainFileDir; MainFileDir = MainFile->getDir()->getName(); - else - MainFileDir = AbsFileName.getDirname(); + llvm::sys::Path AbsFileDirName(MainFileDir); + AbsFileDirName.makeAbsolute(); + AbsFileDirName.appendComponent(MainFileName); + FileNamePtr = DebugInfoNames.Allocate(AbsFileDirName.size()); + memcpy(FileNamePtr, AbsFileDirName.c_str(), AbsFileDirName.size()); + } else { + llvm::sys::Path AbsFileDirName(MainFileName); + AbsFileDirName.makeAbsolute(); + FileNamePtr = DebugInfoNames.Allocate(AbsFileDirName.size()); + memcpy(FileNamePtr, AbsFileDirName.c_str(), AbsFileDirName.size()); + } unsigned LangTag; const LangOptions &LO = CGM.getLangOptions(); @@ -229,7 +236,7 @@ void CGDebugInfo::CreateCompileUnit() { // Create new compile unit. TheCU = DebugFactory.CreateCompileUnit( - LangTag, AbsFileName.getLast(), MainFileDir, Producer, true, + LangTag, FileNamePtr, llvm::StringRef(), Producer, true, LO.Optimize, CGM.getCodeGenOpts().DwarfDebugFlags, RuntimeVers); }