[SymbolGraph] add a USR for RHS types in generic conformances #36242
Conversation
rdar://70442228
|
@swift-ci Please smoke test |
lib/SymbolGraphGen/JSON.cpp
Outdated
| @@ -105,6 +106,16 @@ void swift::symbolgraphgen::serialize(const Requirement &Req, | |||
| OS.attribute("kind", Kind); | |||
| OS.attribute("lhs", Req.getFirstType()->getString()); | |||
| OS.attribute("rhs", Req.getSecondType()->getString()); | |||
|
|
|||
| // If the RHS type has a USR we can link to, add it to the output | |||
| if (!Req.getSecondType()->isTypeParameter() && !Req.getSecondType()->hasArchetype()) { | |||
There was a problem hiding this comment.
Maybe you want Req->getSecondType()->getAnyNominal() here? The predicate as written above will also return true for function types that don't contain generic parameters, metatypes, etc. Also the RHS might be a nominal type and contain a generic parameter, eg Array<T>, in which case you can still emit a USR to link to the definition of Array, right?
There was a problem hiding this comment.
Array<T> will return false from isTypeParameter because that function is meant to check for the T itself - there's a separate hasTypeParameter for checking whether a type has parameters, as afar as i can tell. The separate hasArchetype call is meant to guard against an assertion in printTypeUSR.
getAnyNominal does seem like a better choice for what this needs, though - i'll take a look at that instead.
|
It looks like @swift-ci Please smoke test |
Fixes rdar://70442228
When reading a generic conformance in a symbol graph, it can be useful to know what precise type or protocol a conformance is linking to. This PR adds an extra
rhsPrecisefield to theconstraintsobject in theswiftGenericsmixin to give a USR that corresponds torhs. This can be used to look up the item being referenced in the constraint.