Fix parent instantantiation verification.

	* verify.c (mono_verifier_verify_class): Don't verify
	the parent instantiation of generic instances as those are
	allowed to have free variables. Use the right context for
	GTD too.

	Fixes build breakage.

diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index adb93fac17299d2a953d79f8e92dd21974f80d90..223a8f94ebedc0d76b048e2f2312fffe5159134c 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -6066,8 +6066,11 @@ mono_verifier_verify_class (MonoClass *class)
                        return FALSE;
                if (!class->generic_class && class->parent->generic_container)
                        return FALSE;
-               if (class->parent->generic_class) {
-                       if (!mono_type_is_valid_type_in_context (&class->parent->byval_arg, mono_class_get_context (class)))
+               if (class->parent->generic_class && !class->generic_class) {
+                       MonoGenericContext *context = mono_class_get_context (class);
+                       if (class->generic_container)
+                               context = &class->generic_container->context;
+                       if (!mono_type_is_valid_type_in_context (&class->parent->byval_arg, context))
                                return FALSE;
                }
        }