Revert "Merge branch 'master' of https://github.com/mono/mono"

[mono.git] / mono / mini / mini-generic-sharing.c

diff --git a/mono/mini/mini-generic-sharing.c b/mono/mini/mini-generic-sharing.c
index 12a6bb6e60937f8453bfcf296417836437f1f9bb..ab9245f26a948d2f0786bd28cc63b5e0fc41ed1f 100644 (file)
--- a/mono/mini/mini-generic-sharing.c
+++ b/mono/mini/mini-generic-sharing.c
@@ -2538,7 +2538,7 @@ mini_get_basic_type_from_generic (MonoGenericSharingContext *gsctx, MonoType *ty
        if (!type->byref && (type->type == MONO_TYPE_VAR || type->type == MONO_TYPE_MVAR) && mini_is_gsharedvt_type_gsctx (gsctx, type))
                return type;
        else
-               return mono_type_get_basic_type_from_generic (type);
+               return mini_native_type_replace_type (mono_type_get_basic_type_from_generic (type));
 }
 
 /*
@@ -2708,7 +2708,7 @@ mini_is_gsharedvt_variable_klass (MonoCompile *cfg, MonoClass *klass)
        return mini_is_gsharedvt_variable_type (cfg, &klass->byval_arg);
 }
 
-#if defined(MONO_GSHARING)
+#if defined(ENABLE_GSHAREDVT)
 
 #include "../../../mono-extensions/mono/mini/mini-generic-sharing-gsharedvt.c"