зеркало из https://github.com/mono/ikvm-fork.git
Marked all static classes as static.
This commit is contained in:
Родитель
c5dcd8dc53
Коммит
cbeeb20318
|
@ -81,7 +81,7 @@ namespace IKVM.Internal
|
||||||
private string signature;
|
private string signature;
|
||||||
private string[] enclosingMethod;
|
private string[] enclosingMethod;
|
||||||
|
|
||||||
private class SupportedVersions
|
private static class SupportedVersions
|
||||||
{
|
{
|
||||||
internal static readonly int Minimum = 45;
|
internal static readonly int Minimum = 45;
|
||||||
internal static readonly int Maximum = 50;
|
internal static readonly int Maximum = 50;
|
||||||
|
|
|
@ -867,7 +867,7 @@ namespace IKVM.Internal
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !COMPACT_FRAMEWORK
|
#if !COMPACT_FRAMEWORK
|
||||||
private class NonvirtualInvokeHelper
|
private static class NonvirtualInvokeHelper
|
||||||
{
|
{
|
||||||
private static Hashtable cache;
|
private static Hashtable cache;
|
||||||
private static ModuleBuilder module;
|
private static ModuleBuilder module;
|
||||||
|
|
|
@ -51,13 +51,11 @@ namespace IKVM.Internal
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !COMPACT_FRAMEWORK
|
#if !COMPACT_FRAMEWORK
|
||||||
class EmitHelper
|
static class EmitHelper
|
||||||
{
|
{
|
||||||
private static MethodInfo objectToString = typeof(object).GetMethod("ToString", BindingFlags.Public | BindingFlags.Instance, null, Type.EmptyTypes, null);
|
private static MethodInfo objectToString = typeof(object).GetMethod("ToString", BindingFlags.Public | BindingFlags.Instance, null, Type.EmptyTypes, null);
|
||||||
private static MethodInfo verboseCastFailure = JVM.SafeGetEnvironmentVariable("IKVM_VERBOSE_CAST") == null ? null : ByteCodeHelperMethods.VerboseCastFailure;
|
private static MethodInfo verboseCastFailure = JVM.SafeGetEnvironmentVariable("IKVM_VERBOSE_CAST") == null ? null : ByteCodeHelperMethods.VerboseCastFailure;
|
||||||
|
|
||||||
static EmitHelper() {}
|
|
||||||
|
|
||||||
internal static void Throw(ILGenerator ilgen, string dottedClassName)
|
internal static void Throw(ILGenerator ilgen, string dottedClassName)
|
||||||
{
|
{
|
||||||
TypeWrapper exception = ClassLoaderWrapper.GetBootstrapClassLoader().LoadClassByDottedName(dottedClassName);
|
TypeWrapper exception = ClassLoaderWrapper.GetBootstrapClassLoader().LoadClassByDottedName(dottedClassName);
|
||||||
|
@ -128,7 +126,7 @@ namespace IKVM.Internal
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
class AttributeHelper
|
static class AttributeHelper
|
||||||
{
|
{
|
||||||
#if !COMPACT_FRAMEWORK
|
#if !COMPACT_FRAMEWORK
|
||||||
private static CustomAttributeBuilder hideFromJavaAttribute;
|
private static CustomAttributeBuilder hideFromJavaAttribute;
|
||||||
|
@ -3549,7 +3547,7 @@ namespace IKVM.Internal
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !COMPACT_FRAMEWORK
|
#if !COMPACT_FRAMEWORK
|
||||||
class BakedTypeCleanupHack
|
static class BakedTypeCleanupHack
|
||||||
{
|
{
|
||||||
private static readonly FieldInfo m_methodBuilder = typeof(ConstructorBuilder).GetField("m_methodBuilder", BindingFlags.Instance | BindingFlags.NonPublic);
|
private static readonly FieldInfo m_methodBuilder = typeof(ConstructorBuilder).GetField("m_methodBuilder", BindingFlags.Instance | BindingFlags.NonPublic);
|
||||||
private static readonly FieldInfo[] methodBuilderFields = GetFieldList(typeof(MethodBuilder), new string[]
|
private static readonly FieldInfo[] methodBuilderFields = GetFieldList(typeof(MethodBuilder), new string[]
|
||||||
|
@ -7410,7 +7408,7 @@ namespace IKVM.Internal
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !STATIC_COMPILER
|
#if !STATIC_COMPILER
|
||||||
internal class JniProxyBuilder
|
internal static class JniProxyBuilder
|
||||||
{
|
{
|
||||||
private static ModuleBuilder mod;
|
private static ModuleBuilder mod;
|
||||||
private static int count;
|
private static int count;
|
||||||
|
@ -7462,7 +7460,7 @@ namespace IKVM.Internal
|
||||||
}
|
}
|
||||||
#endif // !STATIC_COMPILER
|
#endif // !STATIC_COMPILER
|
||||||
|
|
||||||
private class JniBuilder
|
private static class JniBuilder
|
||||||
{
|
{
|
||||||
#if STATIC_COMPILER
|
#if STATIC_COMPILER
|
||||||
private static readonly Type localRefStructType = StaticCompiler.GetType("IKVM.Runtime.JNI+Frame");
|
private static readonly Type localRefStructType = StaticCompiler.GetType("IKVM.Runtime.JNI+Frame");
|
||||||
|
@ -7674,7 +7672,7 @@ namespace IKVM.Internal
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class TraceHelper
|
private static class TraceHelper
|
||||||
{
|
{
|
||||||
#if STATIC_COMPILER
|
#if STATIC_COMPILER
|
||||||
private readonly static MethodInfo methodIsTracedMethod = typeof(Tracer).GetMethod("IsTracedMethod");
|
private readonly static MethodInfo methodIsTracedMethod = typeof(Tracer).GetMethod("IsTracedMethod");
|
||||||
|
|
|
@ -39,7 +39,7 @@ using ExceptionTableEntry = IKVM.Internal.ClassFile.Method.ExceptionTableEntry;
|
||||||
using LocalVariableTableEntry = IKVM.Internal.ClassFile.Method.LocalVariableTableEntry;
|
using LocalVariableTableEntry = IKVM.Internal.ClassFile.Method.LocalVariableTableEntry;
|
||||||
using Instruction = IKVM.Internal.ClassFile.Method.Instruction;
|
using Instruction = IKVM.Internal.ClassFile.Method.Instruction;
|
||||||
|
|
||||||
class ByteCodeHelperMethods
|
static class ByteCodeHelperMethods
|
||||||
{
|
{
|
||||||
internal static readonly MethodInfo GetClassFromTypeHandle;
|
internal static readonly MethodInfo GetClassFromTypeHandle;
|
||||||
internal static readonly MethodInfo multianewarray;
|
internal static readonly MethodInfo multianewarray;
|
||||||
|
|
|
@ -121,7 +121,7 @@ using ssaGetPropertyAction = sun.security.action.GetPropertyAction;
|
||||||
using sndResolverConfigurationImpl = sun.net.dns.ResolverConfigurationImpl;
|
using sndResolverConfigurationImpl = sun.net.dns.ResolverConfigurationImpl;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
sealed class DynamicMethodSupport
|
static class DynamicMethodSupport
|
||||||
{
|
{
|
||||||
// MONOBUG as of Mono 1.2.5.1, DynamicMethod is too broken to be used
|
// MONOBUG as of Mono 1.2.5.1, DynamicMethod is too broken to be used
|
||||||
internal static readonly bool Enabled = IsFullTrust && Type.GetType("Mono.Runtime") == null;
|
internal static readonly bool Enabled = IsFullTrust && Type.GetType("Mono.Runtime") == null;
|
||||||
|
@ -885,7 +885,7 @@ namespace IKVM.NativeCode.java
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sealed class VirtualFileSystem
|
static class VirtualFileSystem
|
||||||
{
|
{
|
||||||
internal static readonly string RootPath = JVM.IsUnix ? "/.virtual-ikvm-home/" : @"C:\.virtual-ikvm-home\";
|
internal static readonly string RootPath = JVM.IsUnix ? "/.virtual-ikvm-home/" : @"C:\.virtual-ikvm-home\";
|
||||||
|
|
||||||
|
|
|
@ -35,10 +35,8 @@ using IKVM.Internal;
|
||||||
#if !STATIC_COMPILER && !COMPACT_FRAMEWORK
|
#if !STATIC_COMPILER && !COMPACT_FRAMEWORK
|
||||||
namespace IKVM.Internal
|
namespace IKVM.Internal
|
||||||
{
|
{
|
||||||
public sealed class Starter
|
public static class Starter
|
||||||
{
|
{
|
||||||
private Starter() {}
|
|
||||||
|
|
||||||
public static void PrepareForSaveDebugImage()
|
public static void PrepareForSaveDebugImage()
|
||||||
{
|
{
|
||||||
JVM.IsSaveDebugImage = true;
|
JVM.IsSaveDebugImage = true;
|
||||||
|
@ -66,7 +64,7 @@ namespace IKVM.Internal
|
||||||
|
|
||||||
namespace IKVM.Internal
|
namespace IKVM.Internal
|
||||||
{
|
{
|
||||||
class JVM
|
static class JVM
|
||||||
{
|
{
|
||||||
#if STATIC_COMPILER
|
#if STATIC_COMPILER
|
||||||
internal const bool IsStaticCompiler = true;
|
internal const bool IsStaticCompiler = true;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче