From b9c767cce502f016a5bdb07884625a3fffbe048c Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Sat, 18 Dec 2010 04:13:36 +0000 Subject: Support/PathV1: Deprecate get{Basename,Dirname,Suffix}. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122141 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CompilerDriver/CompilationGraph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/CompilerDriver/CompilationGraph.cpp') diff --git a/lib/CompilerDriver/CompilationGraph.cpp b/lib/CompilerDriver/CompilationGraph.cpp index 87a2c48..0e8f5d5 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()) { -- cgit v1.1 From fffa8635361639acadb78089c5b9b445c0aa1d30 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Sat, 18 Dec 2010 07:37:18 +0000 Subject: Revert r122143 through r122140, which collectively broke the LLVMC tests on the buildbots. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122149 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CompilerDriver/CompilationGraph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/CompilerDriver/CompilationGraph.cpp') diff --git a/lib/CompilerDriver/CompilationGraph.cpp b/lib/CompilerDriver/CompilationGraph.cpp index 0e8f5d5..87a2c48 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 = sys::path::extension(File.str()); + StringRef suf = File.getSuffix(); LanguageMap::const_iterator Lang = this->find(suf.empty() ? "*empty*" : suf); if (Lang == this->end()) { -- cgit v1.1 From 738550910156b5cefdc0c12923ec8cc6982fb26f Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Sat, 18 Dec 2010 22:23:07 +0000 Subject: Support/PathV1: Deprecate get{Basename,Dirname,Suffix}. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122157 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CompilerDriver/CompilationGraph.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/CompilerDriver/CompilationGraph.cpp') diff --git a/lib/CompilerDriver/CompilationGraph.cpp b/lib/CompilerDriver/CompilationGraph.cpp index 87a2c48..33c6566 100644 --- a/lib/CompilerDriver/CompilationGraph.cpp +++ b/lib/CompilerDriver/CompilationGraph.cpp @@ -32,7 +32,8 @@ using namespace llvmc; namespace llvmc { const std::string* LanguageMap::GetLanguage(const sys::Path& File) const { - StringRef suf = File.getSuffix(); + // Remove the '.'. + StringRef suf = sys::path::extension(File.str()).substr(1); LanguageMap::const_iterator Lang = this->find(suf.empty() ? "*empty*" : suf); if (Lang == this->end()) { -- cgit v1.1