diff options
| -rw-r--r-- | include/llvm/Support/PathV1.h | 9 | ||||
| -rw-r--r-- | lib/CompilerDriver/CompilationGraph.cpp | 2 | ||||
| -rw-r--r-- | lib/CompilerDriver/Main.cpp | 3 | ||||
| -rw-r--r-- | lib/CompilerDriver/Tool.cpp | 4 | ||||
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 7 | ||||
| -rw-r--r-- | tools/llvm-ld/llvm-ld.cpp | 9 | ||||
| -rw-r--r-- | utils/KillTheDoctor/KillTheDoctor.cpp | 2 |
7 files changed, 17 insertions, 19 deletions
diff --git a/include/llvm/Support/PathV1.h b/include/llvm/Support/PathV1.h index 818b32964e..cac6226ac8 100644 --- a/include/llvm/Support/PathV1.h +++ b/include/llvm/Support/PathV1.h @@ -272,11 +272,13 @@ namespace sys { /// this function to return "foo". /// @returns StringRef containing the basename of the path /// @brief Get the base name of the path - StringRef getBasename() const; + LLVM_ATTRIBUTE_DEPRECATED(StringRef getBasename() const, + LLVMV_PATH_DEPRECATED_MSG); /// This function strips off the suffix of the path beginning with the /// path separator ('/' on Unix, '\' on Windows) and returns the result. - StringRef getDirname() const; + LLVM_ATTRIBUTE_DEPRECATED(StringRef getDirname() const, + LLVMV_PATH_DEPRECATED_MSG); /// This function strips off the path and basename(up to and /// including the last dot) of the file or directory name and @@ -284,7 +286,8 @@ namespace sys { /// this function to return "bar". /// @returns StringRef containing the suffix of the path /// @brief Get the suffix of the path - StringRef getSuffix() const; + LLVM_ATTRIBUTE_DEPRECATED(StringRef getSuffix() const, + LLVMV_PATH_DEPRECATED_MSG); /// Obtain a 'C' string for the path name. /// @returns a 'C' string containing the path name. diff --git a/lib/CompilerDriver/CompilationGraph.cpp b/lib/CompilerDriver/CompilationGraph.cpp index 87a2c4817a..0e8f5d599c 100644 --- a/lib/CompilerDriver/CompilationGraph.cpp +++ b/lib/CompilerDriver/CompilationGraph.cpp @@ -32,7 +32,7 @@ using namespace llvmc; namespace llvmc { const std::string* LanguageMap::GetLanguage(const sys::Path& File) const { - StringRef suf = File.getSuffix(); + StringRef suf = sys::path::extension(File.str()); LanguageMap::const_iterator Lang = this->find(suf.empty() ? "*empty*" : suf); if (Lang == this->end()) { diff --git a/lib/CompilerDriver/Main.cpp b/lib/CompilerDriver/Main.cpp index 4f8794041b..88cfdb2123 100644 --- a/lib/CompilerDriver/Main.cpp +++ b/lib/CompilerDriver/Main.cpp @@ -43,8 +43,7 @@ namespace { return 0; } else if (SaveTemps == SaveTempsEnum::Obj && !OutputFilename.empty()) { - tempDir = OutputFilename; - tempDir = tempDir.getDirname(); + tempDir = sys::path::parent_path(OutputFilename); } else { // SaveTemps == Cwd --> use current dir (leave tempDir empty). diff --git a/lib/CompilerDriver/Tool.cpp b/lib/CompilerDriver/Tool.cpp index 232bd41c4b..876759aa72 100644 --- a/lib/CompilerDriver/Tool.cpp +++ b/lib/CompilerDriver/Tool.cpp @@ -61,7 +61,7 @@ sys::Path Tool::OutFilename(const sys::Path& In, Out.appendSuffix(OutputSuffix); } else { - Out.set(In.getBasename()); + Out.set(sys::path::stem(In.str())); Out.appendSuffix(OutputSuffix); } } @@ -69,7 +69,7 @@ sys::Path Tool::OutFilename(const sys::Path& In, if (IsJoin()) Out = MakeTempFile(TempDir, "tmp", OutputSuffix); else - Out = MakeTempFile(TempDir, In.getBasename(), OutputSuffix); + Out = MakeTempFile(TempDir, sys::path::stem(In.str()), OutputSuffix); } return Out; } diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index dd0b07e09b..c710d7ee86 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -1301,10 +1301,9 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) { // If the source library's module id is in the dependent library list of the // destination library, remove it since that module is now linked in. - sys::Path modId; - modId.set(Src->getModuleIdentifier()); - if (!modId.isEmpty()) - Dest->removeLibrary(modId.getBasename()); + const std::string &modId = Src->getModuleIdentifier(); + if (!modId.empty()) + Dest->removeLibrary(sys::path::stem(modId)); return false; } diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp index 445366c0f7..475fcf4d8a 100644 --- a/tools/llvm-ld/llvm-ld.cpp +++ b/tools/llvm-ld/llvm-ld.cpp @@ -526,7 +526,7 @@ int main(int argc, char **argv, char **envp) { initializeTarget(Registry); // Initial global variable above for convenience printing of program name. - progname = sys::Path(argv[0]).getBasename(); + progname = sys::path::stem(argv[0]); // Parse the command line options cl::ParseCommandLineOptions(argc, argv, "llvm linker\n"); @@ -538,11 +538,8 @@ int main(int argc, char **argv, char **envp) { OutputFilename = "a.exe"; // If there is no suffix add an "exe" one. - sys::Path ExeFile( OutputFilename ); - if (ExeFile.getSuffix() == "") { - ExeFile.appendSuffix("exe"); - OutputFilename = ExeFile.str(); - } + if (sys::path::extension(OutputFilename).empty()) + OutputFilename.append(".exe"); } #endif diff --git a/utils/KillTheDoctor/KillTheDoctor.cpp b/utils/KillTheDoctor/KillTheDoctor.cpp index a623d6af8d..7a89dd379b 100644 --- a/utils/KillTheDoctor/KillTheDoctor.cpp +++ b/utils/KillTheDoctor/KillTheDoctor.cpp @@ -523,7 +523,7 @@ int main(int argc, char **argv) { errs().indent(ToolName.size()) << ": DLL Name : " << DLLName << '\n'; } - if (NoUser32 && sys::Path(DLLName).getBasename() == "user32") { + if (NoUser32 && sys::path::stem(DLLName) == "user32") { // Program is loading user32.dll, in the applications we are testing, // this only happens if an assert has fired. By now the message has // already been printed, so simply close the program. |