[Sema] Fix crash on bad inheritance clause #17662
Conversation
| @@ -956,7 +956,8 @@ void AccessControlChecker::check(Decl *D) { | |||
| return false; | |||
| Type ty = inherited.getType(); | |||
| if (ty->is<ProtocolCompositionType>()) | |||
| ty = ty->getExistentialLayout().superclass; | |||
| if (auto superclass = ty->getExistentialLayout().superclass) | |||
| ty = superclass; | |||
There was a problem hiding this comment.
There’s another copy of this check in the UsableFromInlineChecker too. I know that’s bad and I need to clean it up, but can you fix it and add a test?
| @@ -0,0 +1,9 @@ | |||
| // RUN: not %target-typecheck-verify-swift | |||
There was a problem hiding this comment.
I’d prefer it if you incorporated this test case into an existing file in test/decl/class/ somewhere.
There was a problem hiding this comment.
@slavapestov Thanks, I wasn't sure which to favour in this case. I've gone ahead and put the test case in test/inherit/inherit.swift, as that's where the existing "superclass '%0' must appear first in the inheritance clause" diagnostic is currently being tested – I trust this is okay?
hamishknight
force-pushed
the
bad-inheritance-crash
branch
from
565d00c to
44703c8
Compare
|
|
||
| // SR-8160 | ||
| @usableFromInline | ||
| class D3 : Any, A { } // expected-error{{superclass 'A' must appear first in the inheritance clause}}{{15-18=}}{{12-12=A, }} |
There was a problem hiding this comment.
Can you just change test/decl/inherit/inherit.swift to pass -swift-version 5?
…n checking access
hamishknight
force-pushed
the
bad-inheritance-crash
branch
from
44703c8 to
40fada7
Compare
|
@swift-ci please smoke test |
|
Thanks! |
When checking for the superclass type, ensure we don't use a protocol composition's superclass type if it doesn't have one.
Resolves SR-8160.