Skip to content

[release/7.0] [mono] Assert that we don't need to inflate types when applying DIM overrides #74519

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

[release/7.0] [mono] Assert that we don't need to inflate types when applying DIM overrides #74519

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7187145
do we need to inflate here? it seems like we always get the right class
lambdageek Aug 22, 2022
980767f
use member access, not type punning
lambdageek Aug 23, 2022
d4e032e
Add regression test for #70190
lambdageek Aug 23, 2022
972c3f0
Assert code from #64102 is unreachable
lambdageek Aug 23, 2022
64672b0
Assert that overrides are already inflated how we expect
lambdageek Aug 23, 2022
9a2f887
try to enable some disabled DIM tests
lambdageek Aug 23, 2022
566b70b
remove unused var
lambdageek Aug 23, 2022
8d69b4c
Don't assert - code is reachable, there's just nothing to do
lambdageek Aug 24, 2022
c0cfadf
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
use member access, not type punning
  • Loading branch information
@lambdageek
lambdageek authored and github-actions committed Aug 24, 2022
commit 980767f5085325af7a94f286823dcac4114e0374
3 changes: 2 additions & 1 deletion 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 @@ -932,7 +932,8 @@ mono_class_setup_vtable_full (MonoClass *klass, GList *in_setup)
context = mono_class_get_context (klass);
type_token = mono_class_get_generic_class (klass)->container_class->type_token;
} else {
context = (MonoGenericContext *) mono_class_try_get_generic_container (klass); //FIXME is this a case of a try?
MonoGenericContainer *container = mono_class_try_get_generic_container (klass); //FIXME is this a case of a try?
context = container ? &container->context : NULL;
type_token = klass->type_token;
}

Expand Down