File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -1582,7 +1582,7 @@ namespace {
1582
1582
// If this is `Builtin.trigger_fallback_diagnostic()`, fail
1583
1583
// without producing any diagnostics, in order to test fallback error.
1584
1584
if (isTriggerFallbackDiagnosticBuiltin (expr, CS.getASTContext ()))
1585
- return nullptr ;
1585
+ return Type () ;
1586
1586
1587
1587
// Open a member constraint for constructor delegations on the
1588
1588
// subexpr type.
@@ -3143,7 +3143,7 @@ namespace {
3143
3143
if (DRE->getDecl () != Context.TheBuiltinModule )
3144
3144
return false ;
3145
3145
3146
- auto member = UDE->getName ().getBaseIdentifier ().str ();
3146
+ auto member = UDE->getName ().getBaseName ().userFacingName ();
3147
3147
return member.equals (" trigger_fallback_diagnostic" );
3148
3148
}
3149
3149
Original file line number Diff line number Diff line change @@ -2006,8 +2006,7 @@ class FallbackDiagnosticListener : public ExprTypeCheckListener {
2006
2006
[](const std::pair<ConstraintLocator *, ProtocolConformanceRef>
2007
2007
&conformance) -> bool {
2008
2008
auto &ref = conformance.second ;
2009
- return ref.isConcrete () && (ref.getConcrete ()->isInvalid () ||
2010
- ref.getConcrete ()->isIncomplete ());
2009
+ return ref.isConcrete () && ref.getConcrete ()->isInvalid ();
2011
2010
}))
2012
2011
return ;
2013
2012
You can’t perform that action at this time.
0 commit comments