[runtime] Get rid of the MONO_GENERIC_SHARING env variable, its no longer needed.

diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h
index b67219e239a5fe6c06370caf7f00f38a474281cf..1dfeaeed192f17c9598bfd2b041af3fc42de0948 100644 (file)
--- a/mono/metadata/class-internals.h
+++ b/mono/metadata/class-internals.h
@@ -862,13 +862,6 @@ typedef struct {
        void       *handle;
 } MonoHandleRef;
 
-enum {
-       MONO_GENERIC_SHARING_NONE,
-       MONO_GENERIC_SHARING_COLLECTIONS,
-       MONO_GENERIC_SHARING_CORLIB,
-       MONO_GENERIC_SHARING_ALL
-};
-
 /*
  * Flags for which contexts were used in inflating a generic.
  */

diff --git a/mono/mini/mini-generic-sharing.c b/mono/mini/mini-generic-sharing.c
index ed21c85287a71610c38b0c7d1cbe79e1bb693ba1..d209b9dae47b3be1dd476cf17ce506b123d79993 100644 (file)
--- a/mono/mini/mini-generic-sharing.c
+++ b/mono/mini/mini-generic-sharing.c
@@ -2397,53 +2397,10 @@ mono_set_partial_sharing_supported (gboolean supported)
 gboolean
 mono_class_generic_sharing_enabled (MonoClass *class)
 {
-       static int generic_sharing = MONO_GENERIC_SHARING_NONE;
-       static gboolean inited = FALSE;
-
-       if (!inited) {
-               const char *option;
-
-               if (gshared_supported)
-                       generic_sharing = MONO_GENERIC_SHARING_ALL;
-               else
-                       generic_sharing = MONO_GENERIC_SHARING_NONE;
-
-               if ((option = g_getenv ("MONO_GENERIC_SHARING"))) {
-                       if (strcmp (option, "corlib") == 0)
-                               generic_sharing = MONO_GENERIC_SHARING_CORLIB;
-                       else if (strcmp (option, "collections") == 0)
-                               generic_sharing = MONO_GENERIC_SHARING_COLLECTIONS;
-                       else if (strcmp (option, "all") == 0)
-                               generic_sharing = MONO_GENERIC_SHARING_ALL;
-                       else if (strcmp (option, "none") == 0)
-                               generic_sharing = MONO_GENERIC_SHARING_NONE;
-                       else
-                               g_warning ("Unknown generic sharing option `%s'.", option);
-               }
-
-               if (!gshared_supported)
-                       generic_sharing = MONO_GENERIC_SHARING_NONE;
-
-               inited = TRUE;
-       }
-
-       switch (generic_sharing) {
-       case MONO_GENERIC_SHARING_NONE:
-               return FALSE;
-       case MONO_GENERIC_SHARING_ALL:
+       if (gshared_supported)
                return TRUE;
-       case MONO_GENERIC_SHARING_CORLIB :
-               return class->image == mono_defaults.corlib;
-       case MONO_GENERIC_SHARING_COLLECTIONS:
-               if (class->image != mono_defaults.corlib)
-                       return FALSE;
-               while (class->nested_in)
-                       class = class->nested_in;
-               return g_str_has_prefix (class->name_space, "System.Collections.Generic");
-       default:
-               g_assert_not_reached ();
-       }
-       return FALSE;
+       else
+               return FALSE;
 }
 
 /*

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index f350e4fa4be767c8e24385673a124040d34e02ce..d965c177bb3d62a4dd05bdb14334546b08a8c62f 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -1285,11 +1285,11 @@ GSHARED_TESTS = \
 test-generic-sharing-normal: $(GSHARED_TESTS)
        @for fn in $+ ; do      \
                echo "Testing $$fn ...";        \
-               MONO_GENERIC_SHARING=all $(RUNTIME) -O=gshared                $$fn > $$fn.stdout || exit 1;     \
-               MONO_GENERIC_SHARING=all $(RUNTIME) -O=gshared,shared         $$fn > $$fn.stdout || exit 1;     \
-               MONO_GENERIC_SHARING=all $(RUNTIME) -O=gshared,-inline        $$fn > $$fn.stdout || exit 1;     \
-               MONO_GENERIC_SHARING=all $(RUNTIME) -O=gshared,-inline,shared $$fn > $fn.stdout || exit 1;      \
-               if [ x$(AOT) = x1 ]; then MONO_GENERIC_SHARING=all $(with_mono_path) $(JITTEST_PROG_RUN) --aot --debug $$fn > /dev/null || exit 1; MONO_GENERIC_SHARING=all $(RUNTIME) $$fn > $$fn.stdout || exit 1; fi; \
+               $(RUNTIME) -O=gshared                $$fn > $$fn.stdout || exit 1;      \
+               $(RUNTIME) -O=gshared,shared         $$fn > $$fn.stdout || exit 1;      \
+               $(RUNTIME) -O=gshared,-inline        $$fn > $$fn.stdout || exit 1;      \
+               $(RUNTIME) -O=gshared,-inline,shared $$fn > $fn.stdout || exit 1;       \
+               if [ x$(AOT) = x1 ]; then $(with_mono_path) $(JITTEST_PROG_RUN) --aot --debug $$fn > /dev/null || exit 1; $(RUNTIME) $$fn > $$fn.stdout || exit 1; fi; \
        done
 
 test-generic-sharing-managed: test-runner.exe $(GSHARED_TESTS)