Skip to content

swift-scan-test: adjust frontend detection for Windows #85993

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
compnerd merged 1 commit into from
Dec 12, 2025
Merged

swift-scan-test: adjust frontend detection for Windows #85993

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
9 changes: 7 additions & 2 deletions tools/swift-scan-test/swift-scan-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/StringSaver.h"
#include "llvm/Support/ThreadPool.h"

Expand Down Expand Up @@ -264,8 +265,12 @@ static int action_scan_dependency(std::vector<const char *> &Args,

static std::vector<const char *>
createArgs(ArrayRef<std::string> Cmd, StringSaver &Saver, Actions Action) {
if (!Cmd.empty() && StringRef(Cmd.front()).ends_with("swift-frontend"))
Cmd = Cmd.drop_front();
if (!Cmd.empty()) {
llvm::SmallString<261> path;
llvm::sys::path::native(Twine{Cmd.front()}, path);
if (llvm::sys::path::filename(path).starts_with("swift-frontend"))
Cmd = Cmd.drop_front();
}

// Quote all the arguments before passing to scanner. The scanner is currently
// tokenize the command-line again before parsing.
Expand Down