[rebranch] Get Swift almost building with stable/20250601 #82243
Conversation
AnthonyLatsis
requested review from
xymus,
nkcsgexi,
rjmccall,
bnbarham,
hamishknight,
rintaro,
zoecarver,
egorzhdan,
beccadax,
ian-twilightcoder,
Xazax-hun,
j-hui,
fahadnayyar,
susmonteiro,
DougGregor,
hborla,
slavapestov and
xedin
as code owners
lib/ClangImporter/ClangImporter.cpp
Outdated
| // FIXME: Should we also do | ||
| // https://github.com/swiftlang/llvm-project/pull/10723? | ||
| llvm::PrefixMapper Mapper; | ||
| clang::tooling::dependencies::DepscanPrefixMapping::configurePrefixMapper( | ||
| Impl.SwiftContext.SearchPathOpts.ScannerPrefixMapper, Mapper); | ||
| SmallVector<llvm::MappedPrefix> Prefixes; | ||
| if (auto E = llvm::MappedPrefix::transformJoined( | ||
| Impl.SwiftContext.SearchPathOpts.ScannerPrefixMapper, Prefixes)) { | ||
| // Save this string. In general the diagnostic might outlive this | ||
| // function. | ||
| auto identifier = | ||
| Impl.SwiftContext.getIdentifier(llvm::toString(std::move(E))); | ||
| Impl.SwiftContext.Diags.diagnose(SourceLoc(), diag::error_prefix_mapping, | ||
| identifier.str()); | ||
| } | ||
| Mapper.addRange(Prefixes); | ||
| Mapper.sort(); | ||
|
|
There was a problem hiding this comment.
This is probably the only change that I feel needs a review. @Xazax-hun Could you take a look?
There was a problem hiding this comment.
Took a look, apart from a nit looks good to me. But just to double check, is this helper function that we used to use gone without any replacement? Although now at least we have a diagnostic for the failure case, which is great.
There was a problem hiding this comment.
Yeah, it was refactored to accept an array of pairs. The splitting for compatibility with the old option is now done inline in the driver.
|
@swift-ci please smoke test macOS |
lib/ClangImporter/ClangImporter.cpp
Outdated
| // FIXME: Should we also do | ||
| // https://github.com/swiftlang/llvm-project/pull/10723? | ||
| llvm::PrefixMapper Mapper; | ||
| clang::tooling::dependencies::DepscanPrefixMapping::configurePrefixMapper( | ||
| Impl.SwiftContext.SearchPathOpts.ScannerPrefixMapper, Mapper); | ||
| SmallVector<llvm::MappedPrefix> Prefixes; | ||
| if (auto E = llvm::MappedPrefix::transformJoined( | ||
| Impl.SwiftContext.SearchPathOpts.ScannerPrefixMapper, Prefixes)) { | ||
| // Save this string. In general the diagnostic might outlive this | ||
| // function. | ||
| auto identifier = | ||
| Impl.SwiftContext.getIdentifier(llvm::toString(std::move(E))); | ||
| Impl.SwiftContext.Diags.diagnose(SourceLoc(), diag::error_prefix_mapping, | ||
| identifier.str()); | ||
| } | ||
| Mapper.addRange(Prefixes); | ||
| Mapper.sort(); | ||
|
|
There was a problem hiding this comment.
Took a look, apart from a nit looks good to me. But just to double check, is this helper function that we used to use gone without any replacement? Although now at least we have a diagnostic for the failure case, which is great.
lib/ClangImporter/ClangImporter.cpp
Outdated
| // FIXME: Should we also do | ||
| // https://github.com/swiftlang/llvm-project/pull/10723? |
There was a problem hiding this comment.
Can we find this out rather than add a fixme? Or add an issue and point to that instead. Otherwise this will just sit here forever more 😅 CC @benlangmuir
…to... ...`clang::tooling::dependencies::DepscanPrefixMapping::configurePrefixMapper` See swiftlang/llvm-project#10723
…er,Writer}` subclasses See llvm/llvm-project#134142
No description provided.