Move Static Initializer out of Module Init path

src/IKVM.Runtime/Accessors/AccessorRef.cs

@@ -15,7 +15,7 @@ internal struct AccessorRef<T> where T : Accessor
         /// <summary>
         /// Gets the accessor value.
         /// </summary>
-        public T Value => JVM.BaseAccessors.Get(ref accessor);
+        public T Value => JVM.Internal.BaseAccessors.Get(ref accessor);
 
     }
 

src/IKVM.Runtime/ByteCodeHelper.cs

@@ -57,7 +57,7 @@ public static class ByteCodeHelper
 
         static ObjectAccessor objectAccessor;
 
-        static ObjectAccessor ObjectAccessor => JVM.BaseAccessors.Get(ref objectAccessor);
+        static ObjectAccessor ObjectAccessor => JVM.Internal.BaseAccessors.Get(ref objectAccessor);
 
 #endif
 
@@ -209,7 +209,7 @@ static RuntimeJavaType LoadTypeWrapper(string clazz, [email protected] cal
                 if (loader != null)
                 {
                     ClassLoaderAccessor cla = null;
-                    JVM.BaseAccessors.Get(ref cla);
+                    JVM.Internal.BaseAccessors.Get(ref cla);
                     cla.InvokeCheckPackageAccess(loader, wrapper.ClassObject, callerId.getCallerClass().pd);
                 }
 

src/IKVM.Runtime/ClassLiteral.cs

@@ -17,7 +17,7 @@ public static class ClassLiteral<T>
         static ClassAccessor classAccessor;
         static object value;
 
-        static ClassAccessor ClassAccessor => JVM.BaseAccessors.Get(ref classAccessor);
+        static ClassAccessor ClassAccessor => JVM.Internal.BaseAccessors.Get(ref classAccessor);
 
         /// <summary>
         /// Gets the class literal value, caching the result.

src/IKVM.Runtime/JVM.Internal.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Diagnostics;
+using System.Security;
+using System.Text;
+using System.Threading;
+
+using IKVM.Runtime.Accessors;
+using IKVM.Runtime.Accessors.Java.Lang;
+using IKVM.Runtime.Vfs;
+
+#if IMPORTER || EXPORTER
+using IKVM.Reflection;
+using Type = IKVM.Reflection.Type;
+#else
+#endif
+
+#if IMPORTER
+using IKVM.Tools.Importer;
+#endif
+
+namespace IKVM.Runtime
+{
+
+    static partial class JVM
+    {
+
+        /// <summary>
+        /// Internal services of the JVM.
+        /// </summary>
+        /// <remarks>
+        /// JVM.Internal exists so that static initialization of JVM does not cause initialization of internal state.
+        /// </remarks>
+        internal static class Internal
+        {
+
+            internal const string JarClassList = "--ikvm-classes--/";
+
+#if FIRST_PASS == false && IMPORTER == false && EXPORTER == false
+
+            internal static readonly RuntimeContext context = new RuntimeContext(new RuntimeContextOptions(), new Resolver(), false);
+            internal static readonly VfsTable vfs = VfsTable.BuildDefaultTable(new VfsRuntimeContext(context), Properties.HomePath);
+            internal static readonly Lazy<object> systemThreadGroup = new Lazy<object>(() => ThreadGroupAccessor.Init());
+            internal static readonly Lazy<object> mainThreadGroup = new Lazy<object>(() => ThreadGroupAccessor.Init(null, SystemThreadGroup, "main"));
+
+            static AccessorCache baseAccessors;
+            static ThreadGroupAccessor threadGroupAccessor;
+            static SystemAccessor systemAccessor;
+
+            internal static AccessorCache BaseAccessors => AccessorCache.Get(ref baseAccessors, context.Resolver.ResolveBaseAssembly());
+
+            internal static ThreadGroupAccessor ThreadGroupAccessor => BaseAccessors.Get(ref threadGroupAccessor);
+
+            internal static SystemAccessor SystemAccessor => BaseAccessors.Get(ref systemAccessor);
+
+#endif
+
+        }
+
+    }
+
+}