Skip to content

🌲Some final build fixes #67714

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.

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

Conversation

etcwilde
Copy link
Member

@etcwilde etcwilde commented Aug 3, 2023

Some final build fixes to get things building for testing. We get to testing, but there are some bits in clang that are hanging forever. We don't want to eat the bots alive, so I'm not sure that we want to fire off the tests just yet. We also need swiftlang/llvm-project#7137 to test or we won't find gtest.

Found a few more missing headers. Adding them in now.
I accidentally added a test for an experiment that I was doing earlier
on. Removing that now because it doesn't build.
strlen on a StringRef doesn't work. Replacing it.
Optional changed to std::optional, so there is no hasValue. Replacing it
so that it builds.
@@ -27,7 +27,7 @@ testHasOption(llvm::opt::OptTable &table, options::ID id,
const std::unordered_set<std::string> &optionSet) {
if (table.getOption(id).hasFlag(swift::options::FrontendOption)) {
auto name = table.getOptionName(id);
if (strlen(name) > 0) {
if (!name.empty() && name[0] != '\0') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just due to the option changes again, !name.empty() here is fine IMO. I know a StringRef can contain \0 but it's not going to happen here.

Copy link
Contributor

@bnbarham bnbarham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM other than the very conservative empty check :P

@etcwilde etcwilde merged commit 27314d1 into swiftlang:rebranch Aug 4, 2023
@etcwilde etcwilde deleted the ewilde/final-final-build-fixes branch August 4, 2023 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants