mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-01 07:30:43 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use proper temp files for preprocessed .i files

Browse source 
I thought DMD would create the temp .i file in the same directory
as the .c file, but it creates it in the current working dir.

Create them in a dedicated new temp directory now, to prevent
collisions (parallel compiler invocations in the same working dir
etc. etc.).
This commit is contained in:
Martin Kinkelin 2023-06-07 15:20:28 +02:00
parent 3ba7ec155e
commit 32176ced56
3 changed files with 54 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
driver/cpreprocessor.cpp
View file

@ -3,6 +3,8 @@
#include "dmd/errors.h"
#include "driver/cl_options.h"
#include "driver/tool.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Program.h"
namespace {
@ -41,12 +43,32 @@ const std::string &getCC(bool isMSVC) {
}
return cached;
}
FileName getOutputPath(const Loc &loc, const char *csrcfile) {
llvm::SmallString<64> buffer;
// 1) create a new temporary directory (e.g., `/tmp/itmp-ldc-10ecec`)
auto ec = llvm::sys::fs::createUniqueDirectory("itmp-ldc", buffer);
if (ec) {
error(loc,
"failed to create temporary directory for preprocessed .i file: %s\n%s",
buffer.c_str(), ec.message().c_str());
fatal();
}
// 2) append the .c file name, replacing the extension with .i
llvm::sys::path::append(buffer, FileName::name(csrcfile));
llvm::sys::path::replace_extension(buffer, i_ext.ptr);
// the directory is removed (after the file) in Module.read()
return FileName::create(buffer.c_str()); // allocates a copy
}
} // anonymous namespace
FileName runCPreprocessor(FileName csrcfile, const Loc &loc, bool &ifile,
OutBuffer &defines) {
const char *importc_h = getPathToImportc_h(loc);
const char *ifilename = FileName::forceExt(csrcfile.toChars(), i_ext.ptr);
const auto &triple = *global.params.targetTriple;
const bool isMSVC = triple.isWindowsMSVCEnvironment();
@ -58,6 +80,8 @@ FileName runCPreprocessor(FileName csrcfile, const Loc &loc, bool &ifile,
msvcEnv.setup();
#endif
FileName ipath = getOutputPath(loc, csrcfile.toChars());
const std::string &cc = getCC(isMSVC);
std::vector<std::string> args;
@ -101,7 +125,7 @@ FileName runCPreprocessor(FileName csrcfile, const Loc &loc, bool &ifile,
args.push_back(csrcfile.toChars());
args.push_back((llvm::Twine("/FI") + importc_h).str());
// preprocessed output file
args.push_back((llvm::Twine("/Fi") + ifilename).str());
args.push_back((llvm::Twine("/Fi") + ipath.toChars()).str());
} else { // Posix
// merge #define's with output:
// https://gcc.gnu.org/onlinedocs/cpp/Invocation.html#index-dD
@ -115,7 +139,7 @@ FileName runCPreprocessor(FileName csrcfile, const Loc &loc, bool &ifile,
args.push_back(importc_h);
args.push_back(csrcfile.toChars());
args.push_back("-o");
args.push_back(ifilename);
args.push_back(ipath.toChars());
}
const int status = executeToolAndWait(loc, cc, args, global.params.verbose);
@ -125,5 +149,5 @@ FileName runCPreprocessor(FileName csrcfile, const Loc &loc, bool &ifile,
}
ifile = true;
return FileName::create(ifilename);
return ipath;
}