Index: lld/trunk/ELF/LTO.cpp =================================================================== --- lld/trunk/ELF/LTO.cpp +++ lld/trunk/ELF/LTO.cpp @@ -150,10 +150,10 @@ // specified, configure LTO to use it as the cache directory. lto::NativeObjectCache Cache; if (!Config->ThinLTOCacheDir.empty()) - Cache = lto::localCache(Config->ThinLTOCacheDir, - [&](size_t Task, StringRef Path) { - Files[Task] = check(MemoryBuffer::getFile(Path)); - }); + Cache = check(lto::localCache( + Config->ThinLTOCacheDir, [&](size_t Task, StringRef Path) { + Files[Task] = check(MemoryBuffer::getFile(Path)); + })); checkError(LTOObj->run( [&](size_t Task) { Index: lld/trunk/test/ELF/lto/cache.ll =================================================================== --- lld/trunk/test/ELF/lto/cache.ll +++ lld/trunk/test/ELF/lto/cache.ll @@ -3,7 +3,7 @@ ; RUN: opt -module-hash -module-summary %s -o %t.o ; RUN: opt -module-hash -module-summary %p/Inputs/cache.ll -o %t2.o -; RUN: rm -Rf %t.cache && mkdir %t.cache +; RUN: rm -Rf %t.cache ; RUN: ld.lld --thinlto-cache-dir=%t.cache -o %t3.o %t2.o %t.o ; RUN: ls %t.cache | count 2 Index: llvm/trunk/include/llvm/LTO/Caching.h =================================================================== --- llvm/trunk/include/llvm/LTO/Caching.h +++ llvm/trunk/include/llvm/LTO/Caching.h @@ -28,8 +28,10 @@ typedef std::function AddFileFn; /// Create a local file system cache which uses the given cache directory and -/// file callback. -NativeObjectCache localCache(StringRef CacheDirectoryPath, AddFileFn AddFile); +/// file callback. This function also creates the cache directory if it does not +/// already exist. +Expected localCache(StringRef CacheDirectoryPath, + AddFileFn AddFile); } // namespace lto } // namespace llvm Index: llvm/trunk/lib/LTO/Caching.cpp =================================================================== --- llvm/trunk/lib/LTO/Caching.cpp +++ llvm/trunk/lib/LTO/Caching.cpp @@ -46,8 +46,11 @@ } } -NativeObjectCache lto::localCache(StringRef CacheDirectoryPath, - AddFileFn AddFile) { +Expected lto::localCache(StringRef CacheDirectoryPath, + AddFileFn AddFile) { + if (std::error_code EC = sys::fs::create_directories(CacheDirectoryPath)) + return errorCodeToError(EC); + return [=](unsigned Task, StringRef Key) -> AddStreamFn { // First, see if we have a cache hit. SmallString<64> EntryPath; Index: llvm/trunk/test/ThinLTO/X86/cache-config.ll =================================================================== --- llvm/trunk/test/ThinLTO/X86/cache-config.ll +++ llvm/trunk/test/ThinLTO/X86/cache-config.ll @@ -1,4 +1,4 @@ -; RUN: rm -rf %t.cache && mkdir %t.cache +; RUN: rm -rf %t.cache ; RUN: opt -module-hash -module-summary %s -o %t.bc ; RUN: llvm-lto2 -o %t.o %t.bc -cache-dir %t.cache -r=%t.bc,globalfunc,plx Index: llvm/trunk/test/ThinLTO/X86/cache.ll =================================================================== --- llvm/trunk/test/ThinLTO/X86/cache.ll +++ llvm/trunk/test/ThinLTO/X86/cache.ll @@ -10,7 +10,7 @@ ; RUN: ls %t.cache | count 1 ; Verify that enabling caching is ignoring module without hash with llvm-lto2 -; RUN: rm -Rf %t.cache && mkdir %t.cache +; RUN: rm -Rf %t.cache ; RUN: llvm-lto2 -o %t.o %t2.bc %t.bc -cache-dir %t.cache \ ; RUN: -r=%t2.bc,_main,plx \ ; RUN: -r=%t2.bc,_globalfunc,lx \ @@ -30,7 +30,7 @@ ; RUN: ls %t.cache | count 3 ; Verify that enabling caching is working with llvm-lto2 -; RUN: rm -Rf %t.cache && mkdir %t.cache +; RUN: rm -Rf %t.cache ; RUN: llvm-lto2 -o %t.o %t2.bc %t.bc -cache-dir %t.cache \ ; RUN: -r=%t2.bc,_main,plx \ ; RUN: -r=%t2.bc,_globalfunc,lx \ Index: llvm/trunk/test/ThinLTO/X86/empty_module_with_cache.ll =================================================================== --- llvm/trunk/test/ThinLTO/X86/empty_module_with_cache.ll +++ llvm/trunk/test/ThinLTO/X86/empty_module_with_cache.ll @@ -8,7 +8,7 @@ ; RUN: ls %t.cache | count 3 ; Verify that enabling caching is working with llvm-lto2 -; RUN: rm -Rf %t.cache && mkdir %t.cache +; RUN: rm -Rf %t.cache ; RUN: llvm-lto2 -o %t.o %t2.bc %t.bc -cache-dir %t.cache \ ; RUN: -r=%t2.bc,_main,plx ; RUN: ls %t.cache | count 2 @@ -25,7 +25,7 @@ ; RUN: ls %t.cache | count 1 ; Verify that caching is disabled for module without hash, with llvm-lto2 -; RUN: rm -Rf %t.cache && mkdir %t.cache +; RUN: rm -Rf %t.cache ; RUN: llvm-lto2 -o %t.o %t2.bc %t.bc -cache-dir %t.cache \ ; RUN: -r=%t2.bc,_main,plx ; RUN: ls %t.cache | count 0 Index: llvm/trunk/test/tools/gold/X86/cache.ll =================================================================== --- llvm/trunk/test/tools/gold/X86/cache.ll +++ llvm/trunk/test/tools/gold/X86/cache.ll @@ -2,7 +2,7 @@ ; RUN: opt -module-summary %s -o %t.o ; RUN: opt -module-summary %p/Inputs/cache.ll -o %t2.o -; RUN: rm -Rf %t.cache && mkdir %t.cache +; RUN: rm -Rf %t.cache ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \ ; RUN: --plugin-opt=thinlto \ ; RUN: --plugin-opt=cache-dir=%t.cache \ @@ -16,7 +16,7 @@ ; RUN: opt -module-hash -module-summary %s -o %t.o ; RUN: opt -module-hash -module-summary %p/Inputs/cache.ll -o %t2.o -; RUN: rm -Rf %t.cache && mkdir %t.cache +; RUN: rm -Rf %t.cache ; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \ ; RUN: --plugin-opt=thinlto \ ; RUN: --plugin-opt=cache-dir=%t.cache \ Index: llvm/trunk/tools/gold/gold-plugin.cpp =================================================================== --- llvm/trunk/tools/gold/gold-plugin.cpp +++ llvm/trunk/tools/gold/gold-plugin.cpp @@ -835,7 +835,7 @@ NativeObjectCache Cache; if (!options::cache_dir.empty()) - Cache = localCache(options::cache_dir, AddFile); + Cache = check(localCache(options::cache_dir, AddFile)); check(Lto->run(AddStream, Cache)); Index: llvm/trunk/tools/llvm-lto2/llvm-lto2.cpp =================================================================== --- llvm/trunk/tools/llvm-lto2/llvm-lto2.cpp +++ llvm/trunk/tools/llvm-lto2/llvm-lto2.cpp @@ -284,7 +284,7 @@ NativeObjectCache Cache; if (!CacheDir.empty()) - Cache = localCache(CacheDir, AddFile); + Cache = check(localCache(CacheDir, AddFile), "failed to create cache"); check(Lto.run(AddStream, Cache), "LTO::run failed"); }