Skip to content

makeOptions: Remove workaround to support LLVM 17 #1999

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
Oct 3, 2025
Merged

makeOptions: Remove workaround to support LLVM 17 #1999

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
19 changes: 0 additions & 19 deletions Sources/makeOptions/makeOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ struct RawOption {
bool isHidden() const { return flags & llvm::opt::HelpHidden; }
};

#if defined(LLVM_VERSION_MAJOR) && LLVM_VERSION_MAJOR == 21

#define OPTTABLE_PREFIXES_TABLE_CODE
#include "swift/Option/Options.inc"
#undef OPTTABLE_PREFIXES_TABLE_CODE
Expand All @@ -102,23 +100,6 @@ static const char *getPrefixedName(unsigned prefixedNameOffset) {
return OptionStrTable[prefixedNameOffset].data();
}

#else // #if defined(LLVM_VERSION_MAJOR) && LLVM_VERSION_MAJOR == 21

#define PREFIX(NAME, VALUE) static constexpr llvm::StringLiteral NAME[] = VALUE;
#include "swift/Option/Options.inc"
#undef PREFIX

static std::vector<llvm::StringRef>
getPrefixes(llvm::ArrayRef<llvm::StringLiteral> prefixes) {
return std::vector<llvm::StringRef>(prefixes.begin(), prefixes.end());
}

static const char *getPrefixedName(const char *prefixedName) {
return prefixedName;
}

#endif // #if defined(LLVM_VERSION_MAJOR) && LLVM_VERSION_MAJOR == 21

namespace {
using namespace swift::options;
using namespace llvm::opt;
Expand Down