From 6fe5c7aa327e188b7176daa5595bbf075a6b94df Mon Sep 17 00:00:00 2001 From: Roman Divacky Date: Tue, 16 Feb 2010 09:30:23 +0000 Subject: Update LLVM to r96341. --- lib/CompilerDriver/CompilationGraph.cpp | 6 ++++-- lib/CompilerDriver/Makefile | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/CompilerDriver') diff --git a/lib/CompilerDriver/CompilationGraph.cpp b/lib/CompilerDriver/CompilationGraph.cpp index 56e5b9ce0761..524607bee779 100644 --- a/lib/CompilerDriver/CompilationGraph.cpp +++ b/lib/CompilerDriver/CompilationGraph.cpp @@ -33,9 +33,11 @@ using namespace llvmc; namespace llvmc { const std::string& LanguageMap::GetLanguage(const sys::Path& File) const { - LanguageMap::const_iterator Lang = this->find(File.getSuffix()); + StringRef suf = File.getSuffix(); + LanguageMap::const_iterator Lang = this->find(suf); if (Lang == this->end()) - throw std::runtime_error(("Unknown suffix: " + File.getSuffix()).str()); + throw std::runtime_error("File '" + File.str() + + "' has unknown suffix '" + suf.str() + '\''); return Lang->second; } } diff --git a/lib/CompilerDriver/Makefile b/lib/CompilerDriver/Makefile index a5ecfd5d324e..66c6d11552fc 100644 --- a/lib/CompilerDriver/Makefile +++ b/lib/CompilerDriver/Makefile @@ -22,6 +22,7 @@ else endif REQUIRES_EH := 1 +REQUIRES_RTTI := 1 include $(LEVEL)/Makefile.common -- cgit v1.3