diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Lex/ModuleMap.cpp | 6 | ||||
| -rw-r--r-- | clang/lib/Tooling/Tooling.cpp | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index b2698b1877d..df80a93e4db 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -541,11 +541,9 @@ ModuleMap::inferFrameworkModule(StringRef ModuleName, SmallString<128> SubframeworksDirName = StringRef(FrameworkDir->getName()); llvm::sys::path::append(SubframeworksDirName, "Frameworks"); - SmallString<128> SubframeworksDirNameNative; - llvm::sys::path::native(SubframeworksDirName.str(), - SubframeworksDirNameNative); + llvm::sys::path::native(SubframeworksDirName); for (llvm::sys::fs::directory_iterator - Dir(SubframeworksDirNameNative.str(), EC), DirEnd; + Dir(SubframeworksDirName.str(), EC), DirEnd; Dir != DirEnd && !EC; Dir.increment(EC)) { if (!StringRef(Dir->path()).endswith(".framework")) continue; diff --git a/clang/lib/Tooling/Tooling.cpp b/clang/lib/Tooling/Tooling.cpp index 6f7e7b6c1c4..b420ba934d4 100644 --- a/clang/lib/Tooling/Tooling.cpp +++ b/clang/lib/Tooling/Tooling.cpp @@ -134,9 +134,8 @@ std::string getAbsolutePath(StringRef File) { llvm::error_code EC = llvm::sys::fs::make_absolute(AbsolutePath); assert(!EC); (void)EC; - SmallString<1024> PathStorage; - llvm::sys::path::native(Twine(AbsolutePath), PathStorage); - return PathStorage.str(); + llvm::sys::path::native(AbsolutePath); + return AbsolutePath.str(); } ToolInvocation::ToolInvocation( |
