Use Path.makeAbsolute() and make a constant std::string a const char*.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90851 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index 56ee63f..197c145 100644
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -84,11 +84,7 @@
// Get absolute path name.
llvm::sys::Path AbsFileName(FileName);
- if (!AbsFileName.isAbsolute()) {
- llvm::sys::Path tmp = llvm::sys::Path::GetCurrentDirectory();
- tmp.appendComponent(FileName);
- AbsFileName = tmp;
- }
+ AbsFileName.makeAbsolute();
// See if thie compile unit is representing main source file. Each source
// file has corresponding compile unit. There is only one main source
@@ -122,7 +118,7 @@
LangTag = llvm::dwarf::DW_LANG_C89;
}
- std::string Producer =
+ const char *Producer =
#ifdef CLANG_VENDOR
CLANG_VENDOR
#endif
@@ -139,7 +135,7 @@
return Unit = DebugFactory.CreateCompileUnit(LangTag,
AbsFileName.getLast(),
AbsFileName.getDirname(),
- Producer.c_str(), isMain,
+ Producer, isMain,
isOptimized, Flags, RuntimeVers);
}