averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[driver] Added support for determining a better output for a merge module Command.

Browse Source 
First, prefer -module-output-path over any other options when binding the output
for a merge module Command. If that’s not set, use the same behavior as other
intermediate outputs, but use the module name as the base name (instead of the
BaseInput, which is not descriptive enough for a swiftmodule).

This does not yet handle the case where the emitted module should be treated as
a top-level output, even though it’s not the top-level job (essentially,
whenever -emit-module is passed but the driver isn't in EmitModuleOnly mode).

Swift SVN r12500
This commit is contained in:
Connor Wakamo
2014-01-17 19:39:24 +00:00
parent f99d60906c
commit 5dae76ea22
1 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
lib/Driver/Driver.cpp
View File

@@ -518,44 +518,61 @@ Job *Driver::buildJobsForAction(const Compilation &C, const Action *A,
if (JA->getType() == types::TY_Nothing) {
Output.reset(new CommandOutput(BaseInput));
} else {
if (AtTopLevel) {
if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o)) {
Output.reset(new CommandOutput(JA->getType(), FinalOutput->getValue(),
// Process Action-specific output-specifying options first.
if (isa<MergeModuleJobAction>(JA)) {
if (Arg *A = C.getArgs().getLastArg(options::OPT_module_output_path))
Output.reset(new CommandOutput(JA->getType(), A->getValue(),
BaseInput));
}
}
if (!Output) {
// We don't yet have a name, assign one.
if (!AtTopLevel) {
// We should output to a temporary file, since we're not at
// the top level.
StringRef Stem = llvm::sys::path::stem(BaseInput);
StringRef Suffix = types::getTypeTempSuffix(JA->getType());
llvm::SmallString<128> Path;
llvm::error_code EC = llvm::sys::fs::createTemporaryFile(Stem,
Suffix, Path);
if (EC) {
llvm::errs() << "error: unable to make temporary file" <<EC.message();
Path = "";
// We don't have an output from an Action-specific command line option,
// so figure one out using the defaults.
if (AtTopLevel) {
if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o)) {
Output.reset(new CommandOutput(JA->getType(), FinalOutput->getValue(),
BaseInput));
}
Output.reset(new CommandOutput(JA->getType(),
C.getArgs().MakeArgString(Path.str()),
BaseInput));
} else {
if (JA->getType() == types::TY_Image) {
Output.reset(new CommandOutput(JA->getType(), DefaultImageName,
}
if (!Output) {
StringRef BaseName(BaseInput);
if (isa<MergeModuleJobAction>(JA))
BaseName = OM.ModuleName;
// We don't yet have a name, assign one.
if (!AtTopLevel) {
// We should output to a temporary file, since we're not at
// the top level.
StringRef Stem = llvm::sys::path::stem(BaseName);
StringRef Suffix = types::getTypeTempSuffix(JA->getType());
llvm::SmallString<128> Path;
llvm::error_code EC = llvm::sys::fs::createTemporaryFile(Stem, Suffix,
Path);
if (EC) {
llvm::errs() << "error: unable to make temporary file"
<< EC.message();
Path = "";
}
Output.reset(new CommandOutput(JA->getType(),
C.getArgs().MakeArgString(Path.str()),
BaseInput));
} else {
StringRef Suffix = types::getTypeTempSuffix(JA->getType());
assert(Suffix.data() &&
"All types used for output should have a suffix.");
if (JA->getType() == types::TY_Image) {
Output.reset(new CommandOutput(JA->getType(), DefaultImageName,
BaseInput));
} else {
StringRef Suffix = types::getTypeTempSuffix(JA->getType());
assert(Suffix.data() &&
"All types used for output should have a suffix.");
llvm::SmallString<128> Suffixed(llvm::sys::path::filename(BaseInput));
llvm::sys::path::replace_extension(Suffixed, Suffix);
Output.reset(new CommandOutput(JA->getType(),
C.getArgs().MakeArgString(Suffixed),
BaseInput));
llvm::SmallString<128> Suffixed(
llvm::sys::path::filename(BaseName));
llvm::sys::path::replace_extension(Suffixed, Suffix);
Output.reset(new CommandOutput(JA->getType(),
C.getArgs().MakeArgString(Suffixed),
BaseInput));
}
}
}
}