Skip to content

Commit f1f015c

Browse files
committed
[Sema] Use path::append in ModuleLibraryLevelRequest
1 parent cf58bb7 commit f1f015c

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

lib/AST/Module.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2257,12 +2257,14 @@ ModuleLibraryLevelRequest::evaluate(Evaluator &evaluator,
22572257
const ModuleDecl *module) const {
22582258
auto &ctx = module->getASTContext();
22592259

2260-
/// Is \p path from System/Library/PrivateFrameworks/?
2261-
auto fromPrivateFrameworks = [&](StringRef path) -> bool {
2262-
auto sep = llvm::sys::path::get_separator();
2263-
auto privateFrameworksPath = llvm::Twine(ctx.SearchPathOpts.SDKPath) +
2264-
sep + "System" + sep + "Library" + sep + "PrivateFrameworks" + sep;
2265-
return hasPrefix(path, privateFrameworksPath.str());
2260+
/// Is \p modulePath from System/Library/PrivateFrameworks/?
2261+
auto fromPrivateFrameworks = [&](StringRef modulePath) -> bool {
2262+
namespace path = llvm::sys::path;
2263+
SmallString<128> scratch;
2264+
scratch = ctx.SearchPathOpts.SDKPath;
2265+
path::append(scratch, "System", "Library", "PrivateFrameworks");
2266+
return hasPrefix(path::begin(modulePath), path::end(modulePath),
2267+
path::begin(scratch), path::end(scratch));
22662268
};
22672269

22682270
if (module->isNonSwiftModule()) {

0 commit comments

Comments
 (0)