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 #38111 from xedin/rdar-79672230

Browse Source 
[Diagnostics] Fix requirement note to properly handle layout requirements
This commit is contained in:
Pavel Yaskevich
2021-06-28 10:03:08 -07:00
committed by GitHub
parent 6a50c87b77 2b58a75f97
commit 6fcb47d790
6 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/swift/AST/DiagnosticsSema.def
View File

@@ -1988,16 +1988,16 @@ NOTE(wrapped_type_satisfies_requirement,none,
"wrapped type %0 satisfies this requirement; did you mean to unwrap?", (Type))
NOTE(candidate_types_conformance_requirement,none,
"candidate requires that %0 conform to %1 "
"(requirement specified as %2 == %3%4)",
(Type, Type, Type, Type, StringRef))
"(requirement specified as %2 : %3)",
(Type, Type, Type, Type))
NOTE(candidate_types_equal_requirement,none,
"candidate requires that the types %0 and %1 be equivalent "
"(requirement specified as %2 == %3%4)",
(Type, Type, Type, Type, StringRef))
"(requirement specified as %2 == %3)",
(Type, Type, Type, Type))
NOTE(candidate_types_inheritance_requirement,none,
"candidate requires that %1 inherit from %2 "
"(requirement specified as %2 : %3%4)",
(Type, Type, Type, Type, StringRef))
"(requirement specified as %2 : %3)",
(Type, Type, Type, Type))
NOTE(types_not_equal_requirement,none,
"requirement specified as %0 == %1%2", (Type, Type, StringRef))
ERROR(type_is_not_a_class,none,

8
lib/Sema/CSDiagnostics.cpp
View File

@@ -399,8 +399,14 @@ bool RequirementFailure::diagnoseAsNote() {
const auto &req = getRequirement();
const auto *reqDC = getRequirementDC();
// Layout requirement doesn't have a second type, let's always
// `AnyObject`.
auto requirementTy = req.getKind() == RequirementKind::Layout
? getASTContext().getAnyObjectType()
: req.getSecondType();
emitDiagnosticAt(reqDC->getAsDecl(), getDiagnosticAsNote(), getLHS(),
getRHS(), req.getFirstType(), req.getSecondType(), "");
getRHS(), req.getFirstType(), requirementTy);
return true;
}

2
lib/Sema/CSDiagnostics.h
View File

@@ -235,7 +235,7 @@ protected:
using PathEltKind = ConstraintLocator::PathElementKind;
using DiagOnDecl = Diag<DescriptiveDeclKind, DeclName, Type, Type>;
using DiagInReference = Diag<DescriptiveDeclKind, DeclName, Type, Type, Type>;
using DiagAsNote = Diag<Type, Type, Type, Type, StringRef>;
using DiagAsNote = Diag<Type, Type, Type, Type>;
/// If this failure associated with one of the conditional requirements,
/// this field would represent conformance where requirement comes from.

2
test/Constraints/diagnostics.swift
View File

@@ -1262,7 +1262,7 @@ func f11<T : P2>(_ n: T, _ f: @escaping (T) -> T) {} // expected-note {{where '
f11(3, f4) // expected-error {{global function 'f11' requires that 'Int' conform to 'P2'}}
let f12: (Int) -> Void = { _ in } // expected-note {{candidate '(Int) -> Void' requires 1 argument, but 2 were provided}}
func f12<T : P2>(_ n: T, _ f: @escaping (T) -> T) {} // expected-note {{candidate requires that 'Int' conform to 'P2' (requirement specified as 'T' == 'P2')}}
func f12<T : P2>(_ n: T, _ f: @escaping (T) -> T) {} // expected-note {{candidate requires that 'Int' conform to 'P2' (requirement specified as 'T' : 'P2')}}
f12(3, f4)// expected-error {{no exact matches in call to global function 'f12'}}
// SR-12242

11
test/Constraints/overload.swift
View File

@@ -246,3 +246,14 @@ func test_no_hole_propagation() {
return arguments.reduce(0, +) // expected-error {{cannot convert value of type 'Int' to expected argument type 'String'}}
}
}
// rdar://79672230 - crash due to unsatisfied `: AnyObject` requirement
func rdar79672230() {
struct MyType {}
func test(_ representation: MyType) -> Bool {} // expected-note {{found candidate with type 'MyType'}}
func test<T>(_ object: inout T) -> Bool where T : AnyObject {} // expected-note {{candidate requires that 'MyType' conform to 'AnyObject' (requirement specified as 'T' : 'AnyObject')}}
var t: MyType = MyType()
test(&t) // expected-error {{no exact matches in call to local function 'test'}}
}

4
test/decl/ext/protocol.swift
View File

@@ -197,8 +197,8 @@ extension AnotherBazProtocol where BazValue: AnotherBazProtocol {} // ok, does n
// Protocol extensions with additional requirements
// ----------------------------------------------------------------------------
extension P4 where Self.AssocP4 : P1 {
// expected-note@-1 {{candidate requires that 'Int' conform to 'P1' (requirement specified as 'Self.AssocP4' == 'P1')}}
// expected-note@-2 {{candidate requires that 'S4aHelper' conform to 'P1' (requirement specified as 'Self.AssocP4' == 'P1')}}
// expected-note@-1 {{candidate requires that 'Int' conform to 'P1' (requirement specified as 'Self.AssocP4' : 'P1')}}
// expected-note@-2 {{candidate requires that 'S4aHelper' conform to 'P1' (requirement specified as 'Self.AssocP4' : 'P1')}}
func extP4a() {
acceptsP1(reqP4a())
}