Skip to content

[Driver] Remove unused OutputFileMap param #20349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2018
Merged

[Driver] Remove unused OutputFileMap param #20349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions include/swift/Driver/Driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,14 +270,12 @@ class Driver {
/// \param[out] TopLevelActions The main Actions to build Jobs for.
/// \param TC the default host tool chain.
/// \param OI The OutputInfo for which Actions should be generated.
/// \param OFM The OutputFileMap for the compilation; used to find any
/// cross-build information.
/// \param OutOfDateMap If present, information used to decide which files
/// need to be rebuilt.
/// \param C The Compilation to which Actions should be added.
void buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
const ToolChain &TC, const OutputInfo &OI,
const OutputFileMap *OFM, const InputInfoMap *OutOfDateMap,
const InputInfoMap *OutOfDateMap,
Compilation &C) const;

/// Construct the OutputFileMap for the driver from the given arguments.
Expand Down Expand Up @@ -331,7 +329,6 @@ class Driver {
CommandOutput *Output) const;

void chooseSwiftModuleOutputPath(Compilation &C,
const OutputFileMap *OFM,
const TypeToPathMap *OutputMap,
StringRef workingDirectory,
CommandOutput *Output) const;
Expand Down
7 changes: 2 additions & 5 deletions lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ Driver::buildCompilation(const ToolChain &TC,

// Construct the graph of Actions.
SmallVector<const Action *, 8> TopLevelActions;
buildActions(TopLevelActions, TC, OI, OFM ? OFM.getPointer() : nullptr,
buildActions(TopLevelActions, TC, OI,
rebuildEverything ? nullptr : &outOfDateMap, *C);

if (Diags.hadAnyError())
Expand Down Expand Up @@ -1662,7 +1662,6 @@ Driver::computeCompilerMode(const DerivedArgList &Args,

void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
const ToolChain &TC, const OutputInfo &OI,
const OutputFileMap *OFM,
const InputInfoMap *OutOfDateMap,
Compilation &C) const {
const DerivedArgList &Args = C.getArgs();
Expand Down Expand Up @@ -2473,8 +2472,7 @@ Job *Driver::buildJobsForAction(Compilation &C, const JobAction *JA,
Output.get());

if (OI.ShouldGenerateModule && isa<CompileJobAction>(JA))
chooseSwiftModuleOutputPath(C, OFM, OutputMap, workingDirectory,
Output.get());
chooseSwiftModuleOutputPath(C, OutputMap, workingDirectory, Output.get());

if (OI.ShouldGenerateModule &&
(isa<CompileJobAction>(JA) || isa<MergeModuleJobAction>(JA)))
Expand Down Expand Up @@ -2660,7 +2658,6 @@ void Driver::computeMainOutput(
}

void Driver::chooseSwiftModuleOutputPath(Compilation &C,
const OutputFileMap *OFM,
const TypeToPathMap *OutputMap,
StringRef workingDirectory,
CommandOutput *Output) const {
Expand Down