Skip to content

[mono] Assert that we don't need to inflate types when applying DIM overrides #74379

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
lambdageek merged 9 commits into from
Aug 25, 2022
Merged

[mono] Assert that we don't need to inflate types when applying DIM overrides #74379

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
78904b8
do we need to inflate here? it seems like we always get the right class
lambdageek Aug 22, 2022
270196e
use member access, not type punning
lambdageek Aug 23, 2022
ba37013
Add regression test for #70190
lambdageek Aug 23, 2022
55564f9
Assert code from #64102 is unreachable
lambdageek Aug 23, 2022
4226327
Assert that overrides are already inflated how we expect
lambdageek Aug 23, 2022
54d6880
try to enable some disabled DIM tests
lambdageek Aug 23, 2022
34d4348
remove unused var
lambdageek Aug 23, 2022
cae9bd4
Don't assert - code is reachable, there's just nothing to do
lambdageek Aug 24, 2022
2f75323
Add link to issue for failing tests
lambdageek Aug 24, 2022
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
Prev Previous commit
Next Next commit
Don't assert - code is reachable, there's just nothing to do
  • Loading branch information
@lambdageek
lambdageek committed Aug 24, 2022
commit cae9bd44bb3822596a1c461c816b533dffaf7200
8 changes: 3 additions & 5 deletions src/mono/mono/metadata/class-setup-vtable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1756,11 +1756,9 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o
MonoMethod *override = iface_overrides [i*2 + 1];
if (mono_class_is_gtd (override->klass)) {
override = mono_class_inflate_generic_method_full_checked (override, ic, mono_class_get_context (ic), error);
} else if (decl->is_inflated) {
// there used to be code here to inflate decl, but in https://github.com/dotnet/runtime/pull/64102#discussion_r790019545 we
// think that this does not correspond to any real code.
g_assert_not_reached ();
}
}
// there used to be code here to inflate decl if decl->is_inflated, but in https://github.com/dotnet/runtime/pull/64102#discussion_r790019545 we
// think that this does not correspond to any real code.
if (!apply_override (klass, ic, vtable, decl, override, &override_map, &override_class_map, &conflict_map))
goto fail;
}
Expand Down