Skip to content

Commit 0829b8a

Browse files
kastiglionejrose-apple
authored andcommitted
[Driver] Remove unused OutputFileMap param (#20349)
1 parent d6206d5 commit 0829b8a

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

include/swift/Driver/Driver.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,14 +270,12 @@ class Driver {
270270
/// \param[out] TopLevelActions The main Actions to build Jobs for.
271271
/// \param TC the default host tool chain.
272272
/// \param OI The OutputInfo for which Actions should be generated.
273-
/// \param OFM The OutputFileMap for the compilation; used to find any
274-
/// cross-build information.
275273
/// \param OutOfDateMap If present, information used to decide which files
276274
/// need to be rebuilt.
277275
/// \param C The Compilation to which Actions should be added.
278276
void buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
279277
const ToolChain &TC, const OutputInfo &OI,
280-
const OutputFileMap *OFM, const InputInfoMap *OutOfDateMap,
278+
const InputInfoMap *OutOfDateMap,
281279
Compilation &C) const;
282280

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

333331
void chooseSwiftModuleOutputPath(Compilation &C,
334-
const OutputFileMap *OFM,
335332
const TypeToPathMap *OutputMap,
336333
StringRef workingDirectory,
337334
CommandOutput *Output) const;

lib/Driver/Driver.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ Driver::buildCompilation(const ToolChain &TC,
947947

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

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

16631663
void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
16641664
const ToolChain &TC, const OutputInfo &OI,
1665-
const OutputFileMap *OFM,
16661665
const InputInfoMap *OutOfDateMap,
16671666
Compilation &C) const {
16681667
const DerivedArgList &Args = C.getArgs();
@@ -2472,8 +2471,7 @@ Job *Driver::buildJobsForAction(Compilation &C, const JobAction *JA,
24722471
Output.get());
24732472

24742473
if (OI.ShouldGenerateModule && isa<CompileJobAction>(JA))
2475-
chooseSwiftModuleOutputPath(C, OFM, OutputMap, workingDirectory,
2476-
Output.get());
2474+
chooseSwiftModuleOutputPath(C, OutputMap, workingDirectory, Output.get());
24772475

24782476
if (OI.ShouldGenerateModule &&
24792477
(isa<CompileJobAction>(JA) || isa<MergeModuleJobAction>(JA)))
@@ -2659,7 +2657,6 @@ void Driver::computeMainOutput(
26592657
}
26602658

26612659
void Driver::chooseSwiftModuleOutputPath(Compilation &C,
2662-
const OutputFileMap *OFM,
26632660
const TypeToPathMap *OutputMap,
26642661
StringRef workingDirectory,
26652662
CommandOutput *Output) const {

0 commit comments

Comments
 (0)