Skip to content

Commit d8e8582

Browse files
swift-ciswift-ci
committed
Merge remote-tracking branch 'origin/main' into next
2 parents 57dd8f5 + 13a29a0 commit d8e8582

18 files changed

+304
-175
lines changed

‎include/swift/AST/SearchPathOptions.h

Lines changed: 76 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#define SWIFT_AST_SEARCHPATHOPTIONS_H
1515

1616
#include "swift/Basic/ArrayRefView.h"
17+
#include "swift/Basic/ExternalUnion.h"
1718
#include "swift/Basic/PathRemapper.h"
18-
#include "swift/Basic/TaggedUnion.h"
1919
#include "llvm/ADT/Hashing.h"
2020
#include "llvm/ADT/IntrusiveRefCntPtr.h"
2121
#include "llvm/ADT/StringMap.h"
@@ -187,25 +187,81 @@ struct ExternalPluginSearchPathAndServerPath {
187187
std::string ServerPath;
188188
};
189189

190-
namespace PluginSearchOption {
191-
struct LoadPluginLibrary {
192-
std::string LibraryPath;
193-
};
194-
struct LoadPluginExecutable {
195-
std::string ExecutablePath;
196-
std::vector<std::string> ModuleNames;
197-
};
198-
struct PluginPath {
199-
std::string SearchPath;
200-
};
201-
struct ExternalPluginPath {
202-
std::string SearchPath;
203-
std::string ServerPath;
204-
};
190+
class PluginSearchOption {
191+
public:
192+
struct LoadPluginLibrary {
193+
std::string LibraryPath;
194+
};
195+
struct LoadPluginExecutable {
196+
std::string ExecutablePath;
197+
std::vector<std::string> ModuleNames;
198+
};
199+
struct PluginPath {
200+
std::string SearchPath;
201+
};
202+
struct ExternalPluginPath {
203+
std::string SearchPath;
204+
std::string ServerPath;
205+
};
206+
207+
enum class Kind : uint8_t {
208+
LoadPluginLibrary,
209+
LoadPluginExecutable,
210+
PluginPath,
211+
ExternalPluginPath,
212+
};
205213

206-
using Value = TaggedUnion<LoadPluginLibrary, LoadPluginExecutable, PluginPath,
207-
ExternalPluginPath>;
208-
} // namespace PluginSearchOption
214+
private:
215+
using Members = ExternalUnionMembers<LoadPluginLibrary, LoadPluginExecutable,
216+
PluginPath, ExternalPluginPath>;
217+
static Members::Index getIndexForKind(Kind kind) {
218+
switch (kind) {
219+
case Kind::LoadPluginLibrary:
220+
return Members::indexOf<LoadPluginLibrary>();
221+
case Kind::LoadPluginExecutable:
222+
return Members::indexOf<LoadPluginExecutable>();
223+
case Kind::PluginPath:
224+
return Members::indexOf<PluginPath>();
225+
case Kind::ExternalPluginPath:
226+
return Members::indexOf<ExternalPluginPath>();
227+
}
228+
};
229+
using Storage = ExternalUnion<Kind, Members, getIndexForKind>;
230+
231+
Kind kind;
232+
Storage storage;
233+
234+
public:
235+
PluginSearchOption(const LoadPluginLibrary &v)
236+
: kind(Kind::LoadPluginLibrary) {
237+
storage.emplace<LoadPluginLibrary>(kind, v);
238+
}
239+
PluginSearchOption(const LoadPluginExecutable &v)
240+
: kind(Kind::LoadPluginExecutable) {
241+
storage.emplace<LoadPluginExecutable>(kind, v);
242+
}
243+
PluginSearchOption(const PluginPath &v) : kind(Kind::PluginPath) {
244+
storage.emplace<PluginPath>(kind, v);
245+
}
246+
PluginSearchOption(const ExternalPluginPath &v)
247+
: kind(Kind::ExternalPluginPath) {
248+
storage.emplace<ExternalPluginPath>(kind, v);
249+
}
250+
251+
Kind getKind() const { return kind; }
252+
253+
template <typename T>
254+
const T *dyn_cast() const {
255+
if (Members::indexOf<T>() != getIndexForKind(kind))
256+
return nullptr;
257+
return &storage.get<T>(kind);
258+
}
259+
260+
template <typename T>
261+
const T &get() const {
262+
return storage.get<T>(kind);
263+
}
264+
};
209265

210266
/// Options for controlling search path behavior.
211267
class SearchPathOptions {
@@ -383,7 +439,7 @@ class SearchPathOptions {
383439
std::vector<std::string> RuntimeLibraryPaths;
384440

385441
/// Plugin search path options.
386-
std::vector<PluginSearchOption::Value> PluginSearchOpts;
442+
std::vector<PluginSearchOption> PluginSearchOpts;
387443

388444
/// Don't look in for compiler-provided modules.
389445
bool SkipRuntimeLibraryImportPaths = false;

‎include/swift/Driver/ToolChain.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ class ToolChain {
143143
const llvm::opt::ArgList &inputArgs,
144144
llvm::opt::ArgStringList &arguments) const;
145145

146+
virtual void addPlatformSpecificPluginFrontendArgs(
147+
const OutputInfo &OI,
148+
const CommandOutput &output,
149+
const llvm::opt::ArgList &inputArgs,
150+
llvm::opt::ArgStringList &arguments) const;
146151
virtual InvocationInfo constructInvocation(const CompileJobAction &job,
147152
const JobContext &context) const;
148153
virtual InvocationInfo constructInvocation(const InterpretJobAction &job,

‎include/swift/Serialization/SerializationOptions.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#ifndef SWIFT_SERIALIZATION_SERIALIZATIONOPTIONS_H
1414
#define SWIFT_SERIALIZATION_SERIALIZATIONOPTIONS_H
1515

16+
#include "swift/AST/SearchPathOptions.h"
1617
#include "swift/Basic/LLVM.h"
1718
#include "swift/Basic/PathRemapper.h"
1819
#include "llvm/Support/VersionTuple.h"
@@ -43,10 +44,7 @@ namespace swift {
4344
StringRef ModuleLinkName;
4445
StringRef ModuleInterface;
4546
std::vector<std::string> ExtraClangOptions;
46-
std::vector<std::string> PluginSearchPaths;
47-
std::vector<std::string> ExternalPluginSearchPaths;
48-
std::vector<std::string> CompilerPluginLibraryPaths;
49-
std::vector<std::string> CompilerPluginExecutablePaths;
47+
std::vector<swift::PluginSearchOption> PluginSearchOptions;
5048

5149
/// Path prefixes that should be rewritten in debug info.
5250
PathRemapper DebuggingOptionsPrefixMap;

‎include/swift/Serialization/Validation.h

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ struct ValidationInfo {
111111
class ExtendedValidationInfo {
112112
SmallVector<StringRef, 4> ExtraClangImporterOpts;
113113

114-
SmallVector<StringRef, 1> PluginSearchPaths;
115-
SmallVector<StringRef, 1> ExternalPluginSearchPaths;
116-
SmallVector<StringRef, 1> CompilerPluginLibraryPaths;
117-
SmallVector<StringRef, 1> CompilerPluginExecutablePaths;
114+
SmallVector<std::pair<PluginSearchOption::Kind, StringRef>, 2>
115+
PluginSearchOptions;
118116

119117
std::string SDKPath;
120118
StringRef ModuleABIName;
@@ -149,32 +147,13 @@ class ExtendedValidationInfo {
149147
ExtraClangImporterOpts.push_back(option);
150148
}
151149

152-
ArrayRef<StringRef> getPluginSearchPaths() const {
153-
return PluginSearchPaths;
150+
ArrayRef<std::pair<PluginSearchOption::Kind, StringRef>>
151+
getPluginSearchOptions() const {
152+
return PluginSearchOptions;
154153
}
155-
void addPluginSearchPath(StringRef path) {
156-
PluginSearchPaths.push_back(path);
157-
}
158-
159-
ArrayRef<StringRef> getExternalPluginSearchPaths() const {
160-
return ExternalPluginSearchPaths;
161-
}
162-
void addExternalPluginSearchPath(StringRef path) {
163-
ExternalPluginSearchPaths.push_back(path);
164-
}
165-
166-
ArrayRef<StringRef> getCompilerPluginLibraryPaths() const {
167-
return CompilerPluginLibraryPaths;
168-
}
169-
void addCompilerPluginLibraryPath(StringRef path) {
170-
CompilerPluginLibraryPaths.push_back(path);
171-
}
172-
173-
ArrayRef<StringRef> getCompilerPluginExecutablePaths() const {
174-
return CompilerPluginExecutablePaths;
175-
}
176-
void addCompilerPluginExecutablePath(StringRef path) {
177-
CompilerPluginExecutablePaths.push_back(path);
154+
void addPluginSearchOption(
155+
const std::pair<PluginSearchOption::Kind, StringRef> &opt) {
156+
PluginSearchOptions.push_back(opt);
178157
}
179158

180159
bool isSIB() const { return Bits.IsSIB; }

‎lib/AST/PluginLoader.cpp

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,27 +61,31 @@ PluginLoader::lookupPluginByModuleName(Identifier moduleName) {
6161

6262
// FIXME: Should we create a lookup table keyed by module name?
6363
for (auto &entry : Ctx.SearchPathOpts.PluginSearchOpts) {
64-
using namespace PluginSearchOption;
64+
switch (entry.getKind()) {
6565
// Try '-load-plugin-library'.
66-
if (auto *val = entry.dyn_cast<LoadPluginLibrary>()) {
67-
if (llvm::sys::path::filename(val->LibraryPath) == pluginLibBasename) {
68-
return {val->LibraryPath, ""};
66+
case PluginSearchOption::Kind::LoadPluginLibrary: {
67+
auto &val = entry.get<PluginSearchOption::LoadPluginLibrary>();
68+
if (llvm::sys::path::filename(val.LibraryPath) == pluginLibBasename) {
69+
return {val.LibraryPath, ""};
6970
}
7071
continue;
7172
}
7273

7374
// Try '-load-plugin-executable'.
74-
if (auto *v = entry.dyn_cast<LoadPluginExecutable>()) {
75+
case PluginSearchOption::Kind::LoadPluginExecutable: {
76+
auto &val = entry.get<PluginSearchOption::LoadPluginExecutable>();
7577
auto found = ExecutablePluginPaths.find(moduleName);
76-
if (found != ExecutablePluginPaths.end()) {
77-
return {"", std::string(found->second)};
78+
if (found != ExecutablePluginPaths.end() &&
79+
found->second == val.ExecutablePath) {
80+
return {"", val.ExecutablePath};
7881
}
7982
continue;
8083
}
8184

8285
// Try '-plugin-path'.
83-
if (auto *v = entry.dyn_cast<PluginPath>()) {
84-
SmallString<128> fullPath(v->SearchPath);
86+
case PluginSearchOption::Kind::PluginPath: {
87+
auto &val = entry.get<PluginSearchOption::PluginPath>();
88+
SmallString<128> fullPath(val.SearchPath);
8589
llvm::sys::path::append(fullPath, pluginLibBasename);
8690
if (fs->exists(fullPath)) {
8791
return {std::string(fullPath), ""};
@@ -90,14 +94,16 @@ PluginLoader::lookupPluginByModuleName(Identifier moduleName) {
9094
}
9195

9296
// Try '-external-plugin-path'.
93-
if (auto *v = entry.dyn_cast<ExternalPluginPath>()) {
94-
SmallString<128> fullPath(v->SearchPath);
97+
case PluginSearchOption::Kind::ExternalPluginPath: {
98+
auto &val = entry.get<PluginSearchOption::ExternalPluginPath>();
99+
SmallString<128> fullPath(val.SearchPath);
95100
llvm::sys::path::append(fullPath, pluginLibBasename);
96101
if (fs->exists(fullPath)) {
97-
return {std::string(fullPath), v->ServerPath};
102+
return {std::string(fullPath), val.ServerPath};
98103
}
99104
continue;
100105
}
106+
}
101107
}
102108

103109
return {};

‎lib/Driver/DarwinToolChains.cpp

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,51 @@ void toolchains::Darwin::addCommonFrontendArgs(
620620
}
621621
}
622622

623+
/// Add the frontend arguments needed to find external plugins in standard
624+
/// locations based on the base path.
625+
static void addExternalPluginFrontendArgs(
626+
StringRef basePath, const llvm::opt::ArgList &inputArgs,
627+
llvm::opt::ArgStringList &arguments) {
628+
// Plugin server: $BASE/usr/bin/swift-plugin-server
629+
SmallString<128> pluginServer;
630+
llvm::sys::path::append(
631+
pluginServer, basePath, "usr", "bin", "swift-plugin-server");
632+
633+
SmallString<128> pluginDir;
634+
llvm::sys::path::append(pluginDir, basePath, "usr", "lib");
635+
llvm::sys::path::append(pluginDir, "swift", "host", "plugins");
636+
arguments.push_back("-external-plugin-path");
637+
arguments.push_back(inputArgs.MakeArgString(pluginDir + "#" + pluginServer));
638+
639+
pluginDir.clear();
640+
llvm::sys::path::append(pluginDir, basePath, "usr", "local", "lib");
641+
llvm::sys::path::append(pluginDir, "swift", "host", "plugins");
642+
arguments.push_back("-external-plugin-path");
643+
arguments.push_back(inputArgs.MakeArgString(pluginDir + "#" + pluginServer));
644+
}
645+
646+
void toolchains::Darwin::addPlatformSpecificPluginFrontendArgs(
647+
const OutputInfo &OI,
648+
const CommandOutput &output,
649+
const llvm::opt::ArgList &inputArgs,
650+
llvm::opt::ArgStringList &arguments) const {
651+
// Add SDK-relative directories for plugins.
652+
if (!OI.SDKPath.empty()) {
653+
addExternalPluginFrontendArgs(OI.SDKPath, inputArgs, arguments);
654+
}
655+
656+
// Add platform-relative directories for plugins.
657+
if (!OI.SDKPath.empty()) {
658+
SmallString<128> platformPath;
659+
llvm::sys::path::append(platformPath, OI.SDKPath);
660+
llvm::sys::path::remove_filename(platformPath); // specific SDK
661+
llvm::sys::path::remove_filename(platformPath); // SDKs
662+
llvm::sys::path::remove_filename(platformPath); // Developer
663+
llvm::sys::path::append(platformPath, "Developer");
664+
addExternalPluginFrontendArgs(platformPath, inputArgs, arguments);
665+
}
666+
}
667+
623668
ToolChain::InvocationInfo
624669
toolchains::Darwin::constructInvocation(const DynamicLinkJobAction &job,
625670
const JobContext &context) const {

‎lib/Driver/ToolChains.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,9 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
375375
// Specify default plugin search path options after explicitly specified
376376
// options.
377377
inputArgs.AddAllArgs(arguments, options::OPT_plugin_search_Group);
378+
addPlatformSpecificPluginFrontendArgs(OI, output, inputArgs, arguments);
379+
380+
// Toolchain-relative plugin paths
378381
{
379382
SmallString<64> pluginPath;
380383
auto programPath = getDriver().getSwiftProgramPath();
@@ -403,6 +406,14 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
403406
inputArgs.AddAllArgs(arguments, options::OPT_Xcc);
404407
}
405408

409+
void ToolChain::addPlatformSpecificPluginFrontendArgs(
410+
const OutputInfo &OI,
411+
const CommandOutput &output,
412+
const llvm::opt::ArgList &inputArgs,
413+
llvm::opt::ArgStringList &arguments) const {
414+
// Overridden where necessary.
415+
}
416+
406417
static void addRuntimeLibraryFlags(const OutputInfo &OI,
407418
ArgStringList &Arguments) {
408419
if (!OI.RuntimeVariant)

‎lib/Driver/ToolChains.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ class LLVM_LIBRARY_VISIBILITY Darwin : public ToolChain {
5353
const llvm::opt::ArgList &inputArgs,
5454
llvm::opt::ArgStringList &arguments) const override;
5555

56+
void addPlatformSpecificPluginFrontendArgs(
57+
const OutputInfo &OI,
58+
const CommandOutput &output,
59+
const llvm::opt::ArgList &inputArgs,
60+
llvm::opt::ArgStringList &arguments) const override;
61+
5662
InvocationInfo constructInvocation(const InterpretJobAction &job,
5763
const JobContext &context) const override;
5864
InvocationInfo constructInvocation(const DynamicLinkJobAction &job,

‎lib/Frontend/Frontend.cpp

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -209,36 +209,8 @@ SerializationOptions CompilerInvocation::computeSerializationOptions(
209209
serializationOpts.ExtraClangOptions = getClangImporterOptions().ExtraArgs;
210210
}
211211

212-
// FIXME: Preserve the order of these options.
213-
for (auto &elem : getSearchPathOptions().PluginSearchOpts) {
214-
// '-plugin-path' options.
215-
if (auto *arg = elem.dyn_cast<PluginSearchOption::PluginPath>()) {
216-
serializationOpts.PluginSearchPaths.push_back(arg->SearchPath);
217-
continue;
218-
}
219-
220-
// '-external-plugin-path' options.
221-
if (auto *arg = elem.dyn_cast<PluginSearchOption::ExternalPluginPath>()) {
222-
serializationOpts.ExternalPluginSearchPaths.push_back(
223-
arg->SearchPath + "#" + arg->ServerPath);
224-
continue;
225-
}
226-
227-
// '-load-plugin-library' options.
228-
if (auto *arg = elem.dyn_cast<PluginSearchOption::LoadPluginLibrary>()) {
229-
serializationOpts.CompilerPluginLibraryPaths.push_back(arg->LibraryPath);
230-
continue;
231-
}
232-
233-
// '-load-plugin-executable' options.
234-
if (auto *arg = elem.dyn_cast<PluginSearchOption::LoadPluginExecutable>()) {
235-
std::string optStr = arg->ExecutablePath + "#";
236-
llvm::interleave(
237-
arg->ModuleNames, [&](auto &name) { optStr += name; },
238-
[&]() { optStr += ","; });
239-
serializationOpts.CompilerPluginExecutablePaths.push_back(optStr);
240-
}
241-
}
212+
serializationOpts.PluginSearchOptions =
213+
getSearchPathOptions().PluginSearchOpts;
242214

243215
serializationOpts.DisableCrossModuleIncrementalInfo =
244216
opts.DisableCrossModuleIncrementalBuild;

0 commit comments

Comments
 (0)