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

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2024-06-13 06:34:21 -07:00
parent 6b5ba33fe5 4517333b8e
commit eec81cb15e
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/AST/Decl.cpp
View File

@@ -1809,14 +1809,20 @@ bool ExtensionDecl::isWrittenWithConstraints() const {
typeSig->getRequirementsWithInverses(typeReqs, typeInverseReqs);
// If the (non-inverse) requirements are different between the extension and
// the original type, it's written with constraints. Note that
// the extension can only add requirements, so we need only check the size
// (not the specific requirements).
if (extReqs.size() > typeReqs.size()) {
// the original type, it's written with constraints.
if (extReqs.size() != typeReqs.size()) {
return true;
}
assert(extReqs.size() == typeReqs.size());
// In case of equal number of constraints, we have to check the specific
// requirements. Extensions can end up with fewer requirements than the type
// extended, due to a same-type requirement in the extension.
//
// This mirrors the 'same' check in `ASTMangler::gatherGenericSignatureParts`
for (size_t i = 0; i < extReqs.size(); i++) {
if (extReqs[i] != typeReqs[i])
return true;
}
// If the type has no inverse requirements, there are no extra constraints
// to write.

17
validation-test/execution/issue-72719.swift Normal file
View File

@@ -0,0 +1,17 @@
// RUN: %target-swift-frontend -interpret %s
// REQUIRES: executable_test
// This only reproduced if you provide the -interpret flag!
// https://github.com/apple/swift/issues/72719
protocol D {}
struct U: D, Equatable {}
class Q<T> {}
class R<V, E: D & Equatable> {}
extension R where E == U {
struct S<X> {}
static func a<T>(_: T) -> R {
let x = Q<S<T>>()
fatalError()
}
}