[llvm] r268304 - [dsymutil] Create the temporary files in the system temp directory.
Frederic Riss via llvm-commits
llvm-commits at lists.llvm.org
Mon May 2 14:06:14 PDT 2016
Author: friss
Date: Mon May 2 16:06:14 2016
New Revision: 268304
URL: http://llvm.org/viewvc/llvm-project?rev=268304&view=rev
Log:
[dsymutil] Create the temporary files in the system temp directory.
llvm-dsymutil used to create the temporary files in the output directory.
This works fine except when the output directory contains a '%' char, which
is then replaced by llvm::sys::fs::createUniqueFile() generating an invalid
path.
Just use the default temp dir for those files.
Modified:
llvm/trunk/test/tools/dsymutil/fat-binary-output.test
llvm/trunk/tools/dsymutil/dsymutil.cpp
Modified: llvm/trunk/test/tools/dsymutil/fat-binary-output.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/fat-binary-output.test?rev=268304&r1=268303&r2=268304&view=diff
==============================================================================
--- llvm/trunk/test/tools/dsymutil/fat-binary-output.test (original)
+++ llvm/trunk/test/tools/dsymutil/fat-binary-output.test Mon May 2 16:06:14 2016
@@ -24,9 +24,7 @@ CHECK: DW_AT_name{{.*}} "x86_64h_var"
CHECK: Running lipo
CHECK-NEXT: lipo -create
-CHECK-SAME: [[INPUTS_PATH]]fat-test.dylib.tmp{{......}}.dwarf
-CHECK-SAME: [[INPUTS_PATH]]fat-test.dylib.tmp{{......}}.dwarf
-CHECK-SAME: [[INPUTS_PATH]]fat-test.dylib.tmp{{......}}.dwarf
+CHECK-SAME [[TMP_PATH:.*?]]fat-test.dylib.tmp{{......}}.dwarf [[TMP_PATH]]fat-test.dylib.tmp{{......}}.dwarf [[TMP_PATH]]fat-test.dylib.tmp{{......}}.dwarf
CHECK-SAME: -segalign x86_64 20 -segalign i386 20 -segalign x86_64h 20
CHECK-SAME: -output [[INPUTS_PATH]]fat-test.dylib.dwarf
Modified: llvm/trunk/tools/dsymutil/dsymutil.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/dsymutil.cpp?rev=268304&r1=268303&r2=268304&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/dsymutil.cpp (original)
+++ llvm/trunk/tools/dsymutil/dsymutil.cpp Mon May 2 16:06:14 2016
@@ -176,14 +176,17 @@ static std::error_code getUniqueFile(con
static std::string getOutputFileName(llvm::StringRef InputFile,
bool TempFile = false) {
if (TempFile) {
+ llvm::SmallString<128> TmpFile;
+ llvm::sys::path::system_temp_directory(true, TmpFile);
llvm::StringRef Basename =
OutputFileOpt.empty() ? InputFile : llvm::StringRef(OutputFileOpt);
- llvm::Twine OutputFile = Basename + ".tmp%%%%%%.dwarf";
+ llvm::sys::path::append(TmpFile, llvm::sys::path::filename(Basename));
+
int FD;
llvm::SmallString<128> UniqueFile;
- if (auto EC = getUniqueFile(OutputFile, FD, UniqueFile)) {
+ if (auto EC = getUniqueFile(TmpFile + ".tmp%%%%%.dwarf", FD, UniqueFile)) {
llvm::errs() << "error: failed to create temporary outfile '"
- << OutputFile << "': " << EC.message() << '\n';
+ << TmpFile << "': " << EC.message() << '\n';
return "";
}
llvm::sys::RemoveFileOnSignal(UniqueFile);
More information about the llvm-commits
mailing list