Skip to content

[IRGen] Check if VTable isn't a nullptr. #32880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2020
Merged

[IRGen] Check if VTable isn't a nullptr. #32880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/IRGen/ClassMetadataVisitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ template <class Impl> class ClassMetadataVisitor
friend SILVTableVisitor<Impl>;
void addMethod(SILDeclRef declRef) {
// Does this method require a reified runtime vtable entry?
if (methodRequiresReifiedVTableEntry(IGM, VTable, declRef)) {
if (!VTable || methodRequiresReifiedVTableEntry(IGM, VTable, declRef)) {
asImpl().addReifiedVTableEntry(declRef);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/IRGen/GenMeta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,7 +1440,7 @@ namespace {
}

void addMethod(SILDeclRef fn) {
if (methodRequiresReifiedVTableEntry(IGM, VTable, fn)) {
if (!VTable || methodRequiresReifiedVTableEntry(IGM, VTable, fn)) {
VTableEntries.push_back(fn);
} else if (getType()->getEffectiveAccess() >= AccessLevel::Public) {
// Emit a stub method descriptor and lookup function for nonoverridden
Expand Down