Skip to content

Commit e5ea42d

Browse files
troughtontroughton
committed
Driver: renamic LinkJob to DynamicLinkJob and ArchiveJob to StaticLinkJob
# Conflicts: # lib/Driver/DarwinToolChains.cpp
1 parent b34a1cb commit e5ea42d

File tree

10 files changed

+37
-38
lines changed

10 files changed

+37
-38
lines changed

‎include/swift/Driver/Action.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class Action {
4747
ModuleWrapJob,
4848
AutolinkExtractJob,
4949
REPLJob,
50-
LinkJob,
51-
ArchiveJob,
50+
DynamicLinkJob,
51+
StaticLinkJob,
5252
GenerateDSYMJob,
5353
VerifyDebugInfoJob,
5454
GeneratePCHJob,
@@ -306,35 +306,35 @@ class GeneratePCHJobAction : public JobAction {
306306
}
307307
};
308308

309-
class LinkJobAction : public JobAction {
309+
class DynamicLinkJobAction : public JobAction {
310310
virtual void anchor();
311311
LinkKind Kind;
312312

313313
public:
314-
LinkJobAction(ArrayRef<const Action *> Inputs, LinkKind K)
315-
: JobAction(Action::Kind::LinkJob, Inputs, file_types::TY_Image),
314+
DynamicLinkJobAction(ArrayRef<const Action *> Inputs, LinkKind K)
315+
: JobAction(Action::Kind::DynamicLinkJob, Inputs, file_types::TY_Image),
316316
Kind(K) {
317317
assert(Kind != LinkKind::None && Kind != LinkKind::StaticLibrary);
318318
}
319319

320320
LinkKind getKind() const { return Kind; }
321321

322322
static bool classof(const Action *A) {
323-
return A->getKind() == Action::Kind::LinkJob;
323+
return A->getKind() == Action::Kind::DynamicLinkJob;
324324
}
325325
};
326326

327-
class ArchiveJobAction : public JobAction {
327+
class StaticLinkJobAction : public JobAction {
328328
virtual void anchor();
329329

330330
public:
331-
ArchiveJobAction(ArrayRef<const Action *> Inputs, LinkKind K)
332-
: JobAction(Action::Kind::ArchiveJob, Inputs, file_types::TY_Image) {
331+
StaticLinkJobAction(ArrayRef<const Action *> Inputs, LinkKind K)
332+
: JobAction(Action::Kind::StaticLinkJob, Inputs, file_types::TY_Image) {
333333
assert(K == LinkKind::StaticLibrary);
334334
}
335335

336336
static bool classof(const Action *A) {
337-
return A->getKind() == Action::Kind::ArchiveJob;
337+
return A->getKind() == Action::Kind::StaticLinkJob;
338338
}
339339
};
340340

‎include/swift/Driver/ToolChain.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ class ToolChain {
158158
virtual InvocationInfo
159159
constructInvocation(const AutolinkExtractJobAction &job,
160160
const JobContext &context) const;
161-
virtual InvocationInfo constructInvocation(const LinkJobAction &job,
161+
virtual InvocationInfo constructInvocation(const DynamicLinkJobAction &job,
162162
const JobContext &context) const;
163163

164-
virtual InvocationInfo constructInvocation(const ArchiveJobAction &job,
164+
virtual InvocationInfo constructInvocation(const StaticLinkJobAction &job,
165165
const JobContext &context) const;
166166

167167
/// Searches for the given executable in appropriate paths relative to the

‎lib/Driver/Action.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const char *Action::getClassName(Kind AC) {
2828
case Kind::ModuleWrapJob: return "modulewrap";
2929
case Kind::AutolinkExtractJob: return "swift-autolink-extract";
3030
case Kind::REPLJob: return "repl";
31-
case Kind::LinkJob: return "link";
32-
case Kind::ArchiveJob: return "archive";
31+
case Kind::DynamicLinkJob: return "link";
32+
case Kind::StaticLinkJob: return "static-link";
3333
case Kind::GenerateDSYMJob: return "generate-dSYM";
3434
case Kind::VerifyDebugInfoJob: return "verify-debug-info";
3535
case Kind::GeneratePCHJob: return "generate-pch";
@@ -56,9 +56,9 @@ void AutolinkExtractJobAction::anchor() {}
5656

5757
void REPLJobAction::anchor() {}
5858

59-
void LinkJobAction::anchor() {}
59+
void DynamicLinkJobAction::anchor() {}
6060

61-
void ArchiveJobAction::anchor() {}
61+
void StaticLinkJobAction::anchor() {}
6262

6363
void GenerateDSYMJobAction::anchor() {}
6464

‎lib/Driver/DarwinToolChains.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,8 @@ static bool wantsObjCRuntime(const llvm::Triple &triple) {
223223
}
224224

225225
ToolChain::InvocationInfo
226-
toolchains::Darwin::constructInvocation(const LinkJobAction &job,
227-
const JobContext &context) const
228-
{
226+
toolchains::Darwin::constructInvocation(const DynamicLinkJobAction &job,
227+
const JobContext &context) const {
229228
assert(context.Output.getPrimaryOutputType() == file_types::TY_Image &&
230229
"Invalid linker output type.");
231230

@@ -531,7 +530,7 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job,
531530

532531

533532
ToolChain::InvocationInfo
534-
toolchains::Darwin::constructInvocation(const ArchiveJobAction &job,
533+
toolchains::Darwin::constructInvocation(const StaticLinkJobAction &job,
535534
const JobContext &context) const {
536535
assert(context.Output.getPrimaryOutputType() == file_types::TY_Image &&
537536
"Invalid linker output type.");

‎lib/Driver/Driver.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1964,10 +1964,10 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
19641964
JobAction *LinkAction = nullptr;
19651965

19661966
if (OI.LinkAction == LinkKind::StaticLibrary) {
1967-
LinkAction = C.createAction<ArchiveJobAction>(AllLinkerInputs,
1967+
LinkAction = C.createAction<StaticLinkJobAction>(AllLinkerInputs,
19681968
OI.LinkAction);
19691969
} else {
1970-
LinkAction = C.createAction<LinkJobAction>(AllLinkerInputs,
1970+
LinkAction = C.createAction<DynamicLinkJobAction>(AllLinkerInputs,
19711971
OI.LinkAction);
19721972
}
19731973

@@ -2197,14 +2197,14 @@ static StringRef baseNameForImage(const JobAction *JA, const OutputInfo &OI,
21972197
if (JA->size() == 1 && OI.ModuleNameIsFallback && BaseInput != "-")
21982198
return llvm::sys::path::stem(BaseInput);
21992199

2200-
if (auto link = dyn_cast<ArchiveJobAction>(JA)) {
2200+
if (auto link = dyn_cast<StaticLinkJobAction>(JA)) {
22012201
Buffer = "lib";
22022202
Buffer.append(BaseName);
22032203
Buffer.append(Triple.isOSWindows() ? ".lib" : ".a");
22042204
return Buffer.str();
22052205
}
22062206

2207-
auto link = dyn_cast<LinkJobAction>(JA);
2207+
auto link = dyn_cast<DynamicLinkJobAction>(JA);
22082208
if (!link)
22092209
return BaseName;
22102210
if (link->getKind() != LinkKind::DynamicLibrary)

‎lib/Driver/ToolChain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ std::unique_ptr<Job> ToolChain::constructJob(
9999
CASE(BackendJob)
100100
CASE(MergeModuleJob)
101101
CASE(ModuleWrapJob)
102-
CASE(LinkJob)
103-
CASE(ArchiveJob)
102+
CASE(DynamicLinkJob)
103+
CASE(StaticLinkJob)
104104
CASE(GenerateDSYMJob)
105105
CASE(VerifyDebugInfoJob)
106106
CASE(GeneratePCHJob)

‎lib/Driver/ToolChains.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,13 +1087,13 @@ ToolChain::constructInvocation(const AutolinkExtractJobAction &job,
10871087
}
10881088

10891089
ToolChain::InvocationInfo
1090-
ToolChain::constructInvocation(const LinkJobAction &job,
1090+
ToolChain::constructInvocation(const DynamicLinkJobAction &job,
10911091
const JobContext &context) const {
10921092
llvm_unreachable("linking not implemented for this toolchain");
10931093
}
10941094

10951095
ToolChain::InvocationInfo
1096-
ToolChain::constructInvocation(const ArchiveJobAction &job,
1096+
ToolChain::constructInvocation(const StaticLinkJobAction &job,
10971097
const JobContext &context) const {
10981098
llvm_unreachable("archiving not implemented for this toolchain");
10991099
}

‎lib/Driver/ToolChains.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class LLVM_LIBRARY_VISIBILITY Darwin : public ToolChain {
2525
protected:
2626
InvocationInfo constructInvocation(const InterpretJobAction &job,
2727
const JobContext &context) const override;
28-
InvocationInfo constructInvocation(const LinkJobAction &job,
28+
InvocationInfo constructInvocation(const DynamicLinkJobAction &job,
2929
const JobContext &context) const override;
30-
InvocationInfo constructInvocation(const ArchiveJobAction &job,
30+
InvocationInfo constructInvocation(const StaticLinkJobAction &job,
3131
const JobContext &context) const override;
3232

3333
std::string findProgramRelativeToSwiftImpl(StringRef name) const override;
@@ -43,9 +43,9 @@ class LLVM_LIBRARY_VISIBILITY Darwin : public ToolChain {
4343

4444
class LLVM_LIBRARY_VISIBILITY Windows : public ToolChain {
4545
protected:
46-
InvocationInfo constructInvocation(const LinkJobAction &job,
46+
InvocationInfo constructInvocation(const DynamicLinkJobAction &job,
4747
const JobContext &context) const override;
48-
InvocationInfo constructInvocation(const ArchiveJobAction &job,
48+
InvocationInfo constructInvocation(const StaticLinkJobAction &job,
4949
const JobContext &context) const override;
5050

5151
public:
@@ -83,9 +83,9 @@ class LLVM_LIBRARY_VISIBILITY GenericUnix : public ToolChain {
8383
/// default is to return true (and so specify an -rpath).
8484
virtual bool shouldProvideRPathToLinker() const;
8585

86-
InvocationInfo constructInvocation(const LinkJobAction &job,
86+
InvocationInfo constructInvocation(const DynamicLinkJobAction &job,
8787
const JobContext &context) const override;
88-
InvocationInfo constructInvocation(const ArchiveJobAction &job,
88+
InvocationInfo constructInvocation(const StaticLinkJobAction &job,
8989
const JobContext &context) const override;
9090

9191
public:

‎lib/Driver/UnixToolChains.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ bool toolchains::GenericUnix::shouldProvideRPathToLinker() const {
114114
}
115115

116116
ToolChain::InvocationInfo
117-
toolchains::GenericUnix::constructInvocation(const LinkJobAction &job,
117+
toolchains::GenericUnix::constructInvocation(const DynamicLinkJobAction &job,
118118
const JobContext &context) const {
119119
assert(context.Output.getPrimaryOutputType() == file_types::TY_Image &&
120120
"Invalid linker output type.");
@@ -324,7 +324,7 @@ toolchains::GenericUnix::constructInvocation(const LinkJobAction &job,
324324

325325

326326
ToolChain::InvocationInfo
327-
toolchains::GenericUnix::constructInvocation(const ArchiveJobAction &job,
327+
toolchains::GenericUnix::constructInvocation(const StaticLinkJobAction &job,
328328
const JobContext &context) const {
329329
assert(context.Output.getPrimaryOutputType() == file_types::TY_Image &&
330330
"Invalid linker output type.");

‎lib/Driver/WindowsToolChains.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ std::string toolchains::Windows::sanitizerRuntimeLibName(StringRef Sanitizer,
4545
}
4646

4747
ToolChain::InvocationInfo
48-
toolchains::Windows::constructInvocation(const LinkJobAction &job,
48+
toolchains::Windows::constructInvocation(const DynamicLinkJobAction &job,
4949
const JobContext &context) const {
5050
assert(context.Output.getPrimaryOutputType() == file_types::TY_Image &&
5151
"Invalid linker output type.");
@@ -197,7 +197,7 @@ toolchains::Windows::constructInvocation(const LinkJobAction &job,
197197
}
198198

199199
ToolChain::InvocationInfo
200-
toolchains::Windows::constructInvocation(const ArchiveJobAction &job,
200+
toolchains::Windows::constructInvocation(const StaticLinkJobAction &job,
201201
const JobContext &context) const {
202202
assert(context.Output.getPrimaryOutputType() == file_types::TY_Image &&
203203
"Invalid linker output type.");

0 commit comments

Comments
 (0)