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 pull request #84965 from hamishknight/quick-fix-6.2

Browse Source 
[6.2] [Sema] Quick fix for non-copyable type resolution crash
This commit is contained in:
Hamish Knight
2025-10-17 05:38:29 +01:00
committed by GitHub
parent 24154e3638 7629fbd0e0
commit d7bb1fe25f
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/TypeCheckType.cpp
View File

@@ -3958,8 +3958,9 @@ TypeResolver::resolveASTFunctionTypeParams(TupleTypeRepr *inputRepr,
}
// Validate the presence of ownership for a noncopyable parameter.
// FIXME: This won't diagnose if the type contains unbound generics.
if (inStage(TypeResolutionStage::Interface)
&& !ty->hasUnboundGenericType()) {
&& !ty->hasUnboundGenericType() && !ty->hasTypeVariable()) {
diagnoseMissingOwnership(ownership, eltTypeRepr, ty, resolution);
// @_staticExclusiveOnly types cannot be passed as 'inout' in function
@@ -5709,6 +5710,7 @@ NeverNullType TypeResolver::resolveVarargType(VarargTypeRepr *repr,
}
// do not allow move-only types as the element of a vararg
// FIXME: This does not correctly handle type variables and unbound generics.
if (inStage(TypeResolutionStage::Interface)) {
auto contextTy = GenericEnvironment::mapTypeIntoContext(
resolution.getGenericSignature().getGenericEnvironment(), element);
@@ -5895,6 +5897,7 @@ NeverNullType TypeResolver::resolveTupleType(TupleTypeRepr *repr,
// Track the presence of a noncopyable field for diagnostic purposes only.
// We don't need to re-diagnose if a tuple contains another tuple, though,
// since we should've diagnosed the inner tuple already.
// FIXME: This won't diagnose if the type contains unbound generics
if (!ctx.LangOpts.hasFeature(Feature::MoveOnlyTuples) &&
!options.contains(TypeResolutionFlags::SILMode) &&
inStage(TypeResolutionStage::Interface) &&

5
test/Sema/editor_placeholders.swift
View File

@@ -40,3 +40,8 @@ func test_ambiguity_with_placeholders(pairs: [(rank: Int, count: Int)]) -> Bool
let unboundInPlaceholder1: Array<Never> = <#T##Array#> // expected-error{{editor placeholder in source file}}
let unboundInPlaceholder2: Array<Never> = foo(<#T##t: Array##Array<Never>#>) // expected-error{{editor placeholder in source file}}
// Make sure this doesn't crash:
<#T##(Result) -> Void#> // expected-error {{editor placeholder in source file}}
// expected-error@-1 {{generic parameter 'Success' could not be inferred}}
// expected-error@-2 {{generic parameter 'Failure' could not be inferred}}

5
validation-test/compiler_crashers_2_fixed/1e0e4ce6cf612c7b.swift Normal file
View File

@@ -0,0 +1,5 @@
// {"kind":"typecheck","signature":"checkRequirementsImpl(llvm::ArrayRef<swift::Requirement>, bool)","signatureAssert":"Assertion failed: (!firstType->hasTypeVariable()), function checkRequirementsImpl"}
// RUN: not %target-swift-frontend -typecheck %s
struct a<b: ~Copyable
extension a: Copyable where b: Copyable
let c (a -> d

5
validation-test/compiler_crashers_2_fixed/a23d151072660954.swift Normal file
View File

@@ -0,0 +1,5 @@
// {"kind":"typecheck","signature":"checkRequirementsImpl(llvm::ArrayRef<swift::Requirement>, bool)","signatureAssert":"Assertion failed: (!firstType->hasTypeVariable()), function checkRequirementsImpl"}
// RUN: not %target-swift-frontend -typecheck %s
struct a<b: ~Copyable
extension a: Copyable where b: Copyable
let c = <#T##(a -> d)#>