Remove several .c_str() to be forward-compatible with StringRef.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90822 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Driver/Driver.h b/include/clang/Driver/Driver.h
index d3ab1153371acc7adc637a8781ca0cd69064c0e0..8933619b2c2584f07141563bc831d456e0e24951 100644 (file)
--- a/include/clang/Driver/Driver.h
+++ b/include/clang/Driver/Driver.h
@@ -15,6 +15,7 @@
 #include "clang/Driver/Phases.h"
 #include "clang/Driver/Util.h"
 
+#include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/System/Path.h" // FIXME: Kill when CompilationInfo
                               // lands.
@@ -112,9 +113,9 @@ private:
   std::list<std::string> ResultFiles;
 
 public:
-  Driver(const char *_Name, const char *_Dir,
-         const char *_DefaultHostTriple,
-         const char *_DefaultImageName,
+  Driver(llvm::StringRef _Name, llvm::StringRef _Dir,
+         llvm::StringRef _DefaultHostTriple,
+         llvm::StringRef _DefaultImageName,
          bool IsProduction, Diagnostic &_Diags);
   ~Driver();
 

diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index 2b823e0abb48d78011ee0005fff3397fb174dd03..56ee63f098c55573db7f1eaa6ea2e08aad11b032 100644 (file)
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -137,8 +137,8 @@ llvm::DICompileUnit CGDebugInfo::getOrCreateCompileUnit(SourceLocation Loc) {
 
   // Create new compile unit.
   return Unit = DebugFactory.CreateCompileUnit(LangTag, 
-                                               AbsFileName.getLast().c_str(),
-                                               AbsFileName.getDirname().c_str(),
+                                               AbsFileName.getLast(),
+                                               AbsFileName.getDirname(),
                                                Producer.c_str(), isMain, 
                                                isOptimized, Flags, RuntimeVers);
 }

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 7f7affbdb4a3a6188fafa6b662f990cbbe50f59e..dbe7bd9b682df1f2343f0bebfc08c9b7c8551d8e 100644 (file)
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -41,9 +41,9 @@ using namespace clang;
 // Used to set values for "production" clang, for releases.
 // #define USE_PRODUCTION_CLANG
 
-Driver::Driver(const char *_Name, const char *_Dir,
-               const char *_DefaultHostTriple,
-               const char *_DefaultImageName,
+Driver::Driver(llvm::StringRef _Name, llvm::StringRef _Dir,
+               llvm::StringRef _DefaultHostTriple,
+               llvm::StringRef _DefaultImageName,
                bool IsProduction, Diagnostic &_Diags)
   : Opts(createDriverOptTable()), Diags(_Diags),
     Name(_Name), Dir(_Dir), DefaultHostTriple(_DefaultHostTriple),

diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp
index 8c2731b8952dc1e08c3ea4747529dc0020ef9930..8f66d4c16605a439c39489fb4015f5173fe89e77 100644 (file)
--- a/lib/Frontend/ASTUnit.cpp
+++ b/lib/Frontend/ASTUnit.cpp
@@ -300,8 +300,8 @@ ASTUnit *ASTUnit::LoadFromCommandLine(const char **ArgBegin,
   Args.push_back("-fsyntax-only");
 
   llvm::sys::Path Path = llvm::sys::Path::GetMainExecutable(Argv0, MainAddr);
-  driver::Driver TheDriver(Path.getBasename().c_str(),Path.getDirname().c_str(),
-                           llvm::sys::getHostTriple().c_str(),
+  driver::Driver TheDriver(Path.getBasename(), Path.getDirname(),
+                           llvm::sys::getHostTriple(),
                            "a.out", false, Diags);
   llvm::OwningPtr<driver::Compilation> C(
     TheDriver.BuildCompilation(Args.size(), Args.data()));

diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index 527b5f3c0c78a70aa84c37df8d38f3d0611e04d4..cfdd9c342acbbac0d4b6244c620d7ae9bba878a1 100644 (file)
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -212,8 +212,8 @@ int main(int argc, const char **argv) {
 #else
   bool IsProduction = false;
 #endif
-  Driver TheDriver(Path.getBasename().c_str(), Path.getDirname().c_str(),
-                   llvm::sys::getHostTriple().c_str(),
+  Driver TheDriver(Path.getBasename(), Path.getDirname(),
+                   llvm::sys::getHostTriple(),
                    "a.out", IsProduction, Diags);
 
   // Check for ".*++" or ".*++-[^-]*" to determine if we are a C++