averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

swift-scan-test: adjust frontend detection for Windows

Browse Source 
Ensure that we account for file system arc separators and extensions by
using the LLVM functions rather than trying to simply do string
matching. This allows us to properly handle inputs on Windows.
This commit is contained in:
Saleem Abdulrasool
2025-12-11 15:29:09 -08:00
parent d609889e87
commit 54f5837c7b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/swift-scan-test/swift-scan-test.cpp
View File

@@ -23,6 +23,7 @@
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
#include "llvm/Support/Allocator.h" #include "llvm/Support/Allocator.h"
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/StringSaver.h" #include "llvm/Support/StringSaver.h"
#include "llvm/Support/ThreadPool.h" #include "llvm/Support/ThreadPool.h"
@@ -264,8 +265,12 @@ static int action_scan_dependency(std::vector<const char *> &Args,
static std::vector<const char *> static std::vector<const char *>
createArgs(ArrayRef<std::string> Cmd, StringSaver &Saver, Actions Action) { createArgs(ArrayRef<std::string> Cmd, StringSaver &Saver, Actions Action) {
if (!Cmd.empty() && StringRef(Cmd.front()).ends_with("swift-frontend")) if (!Cmd.empty()) {
Cmd = Cmd.drop_front(); 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 // Quote all the arguments before passing to scanner. The scanner is currently
// tokenize the command-line again before parsing. // tokenize the command-line again before parsing.