Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove existing CLASSGC support #384

Merged
merged 7 commits into from
Jul 17, 2023
Merged

Remove existing CLASSGC support #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc23a44
Move many things from IKVM.Internal to IKVM.Runtime. Fix formatting.
wasabii Jul 16, 2023
01ae53d
Move out of ClassFile dir.
wasabii Jul 16, 2023
d8d0ed6
Move.
wasabii Jul 16, 2023
5b76d4c
Organizing more usings. Split files out.
wasabii Jul 16, 2023
0851440
More cleanup.
wasabii Jul 16, 2023
0e01030
Remove CLASSGC versions.
wasabii Jul 16, 2023
123e7d5
Remove more CLASSGC things.
wasabii Jul 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions src/IKVM.Java/map.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
<field name="suppressedExceptions" sig="Ljava.util.List;" />
<clinit>
<body>
<call type="IKVM.Internal.ExceptionHelper" name="getPersistentFields" sig="()[Ljava.io.ObjectStreamField;" />
<call type="IKVM.Runtime.ExceptionHelper" name="getPersistentFields" sig="()[Ljava.io.ObjectStreamField;" />
<stsfld class="java.lang.Throwable" name="serialPersistentFields" sig="[Ljava.io.ObjectStreamField;" />
<ldc_i4_0 />
<newarr sig="Ljava.lang.StackTraceElement;" />
Expand Down Expand Up @@ -994,7 +994,7 @@
</attribute>
<body>
<ldarg_0 />
<call type="IKVM.Internal.ExceptionHelper" name="UnmapException" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
<call type="IKVM.Runtime.ExceptionHelper" name="UnmapException" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
<ret />
</body>
</method>
Expand All @@ -1005,7 +1005,7 @@
</attribute>
<body>
<ldarg_0 />
<call type="IKVM.Internal.ExceptionHelper" name="FixateException" sig="(Ljava.lang.Throwable;)V" />
<call type="IKVM.Runtime.ExceptionHelper" name="FixateException" sig="(Ljava.lang.Throwable;)V" />
<ldarg_0 />
<ret />
</body>
Expand All @@ -1016,7 +1016,7 @@
<body>
<ldarg_0 />
<ldarg_1 />
<call type="IKVM.Internal.ExceptionHelper" name="readObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectInputStream;)V" />
<call type="IKVM.Runtime.ExceptionHelper" name="readObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectInputStream;)V" />
<ret />
</body>
</method>
Expand All @@ -1025,7 +1025,7 @@
<body>
<ldarg_0 />
<ldarg_1 />
<call type="IKVM.Internal.ExceptionHelper" name="writeObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectOutputStream;)V" />
<call type="IKVM.Runtime.ExceptionHelper" name="writeObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectOutputStream;)V" />
<ret />
</body>
</method>
Expand Down Expand Up @@ -1071,7 +1071,7 @@
<!-- End field initialization -->
<ldarg_0 />
<ldarg_1 />
<call type="IKVM.Internal.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
<call type="IKVM.Runtime.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
<call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;)V" />
<ldarg_0 />
<ldarg_0 />
Expand Down Expand Up @@ -1106,7 +1106,7 @@
<!-- End field initialization -->
<ldarg_0 />
<ldarg_1 />
<call type="IKVM.Internal.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
<call type="IKVM.Runtime.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
<ldarg_2 />
<call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" />
<ldarg_0 />
Expand Down Expand Up @@ -1144,7 +1144,7 @@
<!-- End field initialization -->
<ldarg_0 />
<ldarg_1 />
<call type="IKVM.Internal.ExceptionHelper" name="GetMessageFromCause" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" />
<call type="IKVM.Runtime.ExceptionHelper" name="GetMessageFromCause" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" />
<ldarg_1 />
<call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" />
<ldarg_0 />
Expand Down Expand Up @@ -1189,7 +1189,7 @@
<!-- End field initialization -->
<ldarg_0 />
<ldarg_1 />
<call type="IKVM.Internal.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
<call type="IKVM.Runtime.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
<ldarg_2 />
<call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" />
<ldarg_s argNum="4" />
Expand Down Expand Up @@ -1249,7 +1249,7 @@
</alternateBody>
</method>
<method name="getLocalizedMessage" sig="()Ljava.lang.String;" modifiers="public">
<redirect class="cli.IKVM.Internal.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
<redirect class="cli.IKVM.Runtime.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
</method>
<method name="fillInStackTrace" sig="()Ljava.lang.Throwable;" modifiers="public">
<body>
Expand Down Expand Up @@ -1290,7 +1290,7 @@
</body>
<alternateBody>
<ldarg_0 />
<call type="IKVM.Internal.ExceptionHelper" name="fillInStackTrace" sig="(Ljava.lang.Throwable;)V" />
<call type="IKVM.Runtime.ExceptionHelper" name="fillInStackTrace" sig="(Ljava.lang.Throwable;)V" />
<ldarg_0 />
<ret />
</alternateBody>
Expand All @@ -1306,7 +1306,7 @@
<ldarg_0 />
<ldfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
<ldarg_1 />
<call type="IKVM.Internal.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
<call type="IKVM.Runtime.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
<ldarg_0 />
<ldarg_1 />
<stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
Expand All @@ -1327,15 +1327,15 @@
<ldarg_0 />
<ldnull />
<ldnull />
<call type="IKVM.Internal.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
<call type="IKVM.Runtime.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
<ldarg_0 />
<ret />
</alternateBody>
</method>
<method name="getCause" sig="()Ljava.lang.Throwable;" modifiers="public">
<body>
<ldarg_0 />
<call type="IKVM.Internal.ExceptionHelper" name="getCause" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
<call type="IKVM.Runtime.ExceptionHelper" name="getCause" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
<ret />
</body>
<alternateBody>
Expand All @@ -1347,21 +1347,21 @@
<method name="getStackTrace" sig="()[Ljava.lang.StackTraceElement;" modifiers="public">
<body>
<ldarg_0 />
<call type="IKVM.Internal.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
<call type="IKVM.Runtime.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
<callvirt type="System.Array" name="Clone" sig="()Ljava.lang.Object;" />
<castclass class="[Ljava.lang.StackTraceElement;" />
<ret />
</body>
</method>
<method name="getOurStackTrace" sig="()[Ljava.lang.StackTraceElement;" modifiers="private">
<redirect class="cli.IKVM.Internal.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
<redirect class="cli.IKVM.Runtime.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
</method>
<method name="setStackTrace" sig="([Ljava.lang.StackTraceElement;)V" modifiers="public">
<parameter name="stackTrace" />
<redirect class="cli.IKVM.Internal.ExceptionHelper" name="setStackTrace" sig="(Ljava.lang.Throwable;[Ljava.lang.StackTraceElement;)V" />
<redirect class="cli.IKVM.Runtime.ExceptionHelper" name="setStackTrace" sig="(Ljava.lang.Throwable;[Ljava.lang.StackTraceElement;)V" />
</method>
<method name="toString" sig="()Ljava.lang.String;" modifiers="public">
<redirect class="cli.IKVM.Internal.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
<redirect class="cli.IKVM.Runtime.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
</method>
<method name="GetObjectData" sig="(Lcli.System.Runtime.Serialization.SerializationInfo;Lcli.System.Runtime.Serialization.StreamingContext;)V" modifiers="public">
<attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
Expand Down Expand Up @@ -1395,23 +1395,23 @@
</constructor>
<method name="addSuppressed" sig="(Ljava.lang.Throwable;)V" modifiers="public final">
<parameter name="exception" />
<redirect class="cli.IKVM.Internal.ExceptionHelper" name="addSuppressed" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
<redirect class="cli.IKVM.Runtime.ExceptionHelper" name="addSuppressed" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
</method>
<method name="getSuppressed" sig="()[Ljava.lang.Throwable;" modifiers="public final">
<redirect class="cli.IKVM.Internal.ExceptionHelper" name="getSuppressed" sig="(Ljava.lang.Throwable;)[Ljava.lang.Throwable;" />
<redirect class="cli.IKVM.Runtime.ExceptionHelper" name="getSuppressed" sig="(Ljava.lang.Throwable;)[Ljava.lang.Throwable;" />
</method>
<method name="getStackTraceDepth" sig="()I" modifiers="">
<redirect class="cli.IKVM.Internal.ExceptionHelper" name="getStackTraceDepth" sig="(Ljava.lang.Throwable;)I" />
<redirect class="cli.IKVM.Runtime.ExceptionHelper" name="getStackTraceDepth" sig="(Ljava.lang.Throwable;)I" />
</method>
<method name="getStackTraceElement" sig="(I)Ljava.lang.StackTraceElement;" modifiers="">
<redirect class="cli.IKVM.Internal.ExceptionHelper" name="getStackTraceElement" sig="(Ljava.lang.Throwable;I)Ljava.lang.StackTraceElement;" />
<redirect class="cli.IKVM.Runtime.ExceptionHelper" name="getStackTraceElement" sig="(Ljava.lang.Throwable;I)Ljava.lang.StackTraceElement;" />
</method>
</class>
<class name="java.lang.ThrowableHelper">
<method name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;">
<body>
<ldarg_0 />
<call type="IKVM.Internal.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
<call type="IKVM.Runtime.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
<ret />
</body>
</method>
Expand All @@ -1437,12 +1437,12 @@
<!-- Here we are adding/replacing methods to existing classes -->
<class name="java.lang.Class">
<implements class="cli.System.Runtime.Serialization.ISerializable" />
<field name="typeWrapper" sig="Lcli.IKVM.Internal.TypeWrapper;" modifiers="">
<field name="typeWrapper" sig="Lcli.IKVM.Runtime.TypeWrapper;" modifiers="">
<attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
</field>
</class>
<class name="java.lang.ClassLoader">
<field name="wrapper" sig="Lcli.IKVM.Internal.ClassLoaderWrapper;" modifiers="">
<field name="wrapper" sig="Lcli.IKVM.Runtime.ClassLoaderWrapper;" modifiers="">
<attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
</field>
<constructor sig="(Z)V">
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/AccessStubConstructorMethodWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Jeroen Frijters
using System.Reflection.Emit;
#endif

namespace IKVM.Internal
namespace IKVM.Runtime
{

sealed class AccessStubConstructorMethodWrapper : SmartMethodWrapper
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/AccessStubMethodWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Jeroen Frijters
using System.Reflection.Emit;
#endif

namespace IKVM.Internal
namespace IKVM.Runtime
{

sealed class AccessStubMethodWrapper : SmartMethodWrapper
Expand Down
2 changes: 0 additions & 2 deletions src/IKVM.Runtime/Accessors/FieldAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
using System.Reflection.Emit;
using System.Threading;

using IKVM.Internal;

namespace IKVM.Runtime.Accessors
{

Expand Down
2 changes: 0 additions & 2 deletions src/IKVM.Runtime/Accessors/MethodAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
using System.Reflection;
using System.Reflection.Emit;

using IKVM.Internal;

namespace IKVM.Runtime.Accessors
{

Expand Down
2 changes: 0 additions & 2 deletions src/IKVM.Runtime/Accessors/PropertyAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
using System.Reflection;
using System.Reflection.Emit;

using IKVM.Internal;

namespace IKVM.Runtime.Accessors
{

Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/Annotation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Jeroen Frijters
using IKVM.Tools.Importer;
#endif

namespace IKVM.Internal
namespace IKVM.Runtime
{

abstract class Annotation
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/AnonymousTypeWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Jeroen Frijters
using IKVM.Tools.Importer;
#endif

namespace IKVM.Internal
namespace IKVM.Runtime
{

#if !IMPORTER && !EXPORTER
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/ArrayTypeWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Jeroen Frijters
using IKVM.Tools.Importer;
#endif

namespace IKVM.Internal
namespace IKVM.Runtime
{
sealed class ArrayTypeWrapper : TypeWrapper
{
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/ArrayUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Jeroen Frijters
*/
using System;

namespace IKVM.Internal
namespace IKVM.Runtime
{

static class ArrayUtil
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/AssemblyClassLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Jeroen Frijters
using IKVM.Tools.Importer;
#endif

namespace IKVM.Internal
namespace IKVM.Runtime
{

internal class AssemblyClassLoader : ClassLoaderWrapper
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/Assertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Jeroen Frijters
using System;
using System.Globalization;

using IKVM.Internal;
using IKVM.Runtime;

namespace IKVM.Runtime
{
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/AttributeHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Jeroen Frijters
using IKVM.Tools.Importer;
#endif

namespace IKVM.Internal
namespace IKVM.Runtime
{

static class AttributeHelper
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Runtime/Attributes/AnnotationAttributeAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Jeroen Frijters
*/
using System;

using IKVM.Internal;
using IKVM.Runtime;

namespace IKVM.Attributes
{
Expand Down
8 changes: 3 additions & 5 deletions src/IKVM.Runtime/Attributes/AnnotationDefaultAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,15 @@ Jeroen Frijters
*/
using System;

using IKVM.Internal;

#if IMPORTER || EXPORTER
using Type = IKVM.Reflection.Type;
#endif
using IKVM.Runtime;

namespace IKVM.Attributes
{

[AttributeUsage(AttributeTargets.Method)]
public sealed class AnnotationDefaultAttribute : Attribute
{

public const byte TAG_ENUM = (byte)'e';
public const byte TAG_CLASS = (byte)'c';
public const byte TAG_ANNOTATION = (byte)'@';
Expand Down
10 changes: 5 additions & 5 deletions src/IKVM.Runtime/Attributes/ConstantPoolAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,15 @@ Jeroen Frijters
using System;
using System.Collections.Generic;

using IKVM.Internal;

#if IMPORTER || EXPORTER
using Type = IKVM.Reflection.Type;
#endif
using IKVM.Runtime;

namespace IKVM.Attributes
{

[AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface)]
public sealed class ConstantPoolAttribute : Attribute
{

internal readonly object[] constantPool;

public ConstantPoolAttribute(object[] constantPool)
Expand Down Expand Up @@ -112,5 +110,7 @@ private static object Escape(object obj)
}
return obj;
}

}

}
8 changes: 4 additions & 4 deletions src/IKVM.Runtime/Attributes/DynamicAnnotationAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ Jeroen Frijters
*/
using System;

#if IMPORTER || EXPORTER
using Type = IKVM.Reflection.Type;
#endif

namespace IKVM.Attributes
{

[AttributeUsage(AttributeTargets.Class | AttributeTargets.Delegate | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Parameter, AllowMultiple = false)]
public sealed class DynamicAnnotationAttribute : Attribute
{

private readonly object[] definition;

public DynamicAnnotationAttribute(object[] definition)
Expand All @@ -43,5 +41,7 @@ public object[] Definition
{
get { return definition; }
}

}

}
Loading