Skip to content

Commit

Permalink
Use pattern matching for a test.
Browse files Browse the repository at this point in the history
IKVM.ByteCode 9.0.0 release.
  • Loading branch information
wasabii committed Aug 14, 2024
1 parent 5577eac commit 2460b67
Show file tree
Hide file tree
Showing 6 changed files with 282 additions and 17 deletions.
2 changes: 1 addition & 1 deletion IKVM.deps.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<ItemGroup>
<PackageReference Include="IKVM.ByteCode" Version="8.13.0-dev.3" />
<PackageReference Include="IKVM.ByteCode" Version="9.0.0" />
</ItemGroup>

<Choose>
Expand Down
43 changes: 28 additions & 15 deletions src/IKVM.Runtime/ClassFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,11 @@ internal Field GetField(string name, string sig)
return null;
}

private void RemoveAssertionInit(Method m)
/// <summary>
/// Removes a call to java.lang.Class.desiredAssertionStatus() and replaces it with a hard coded constant (true).
/// </summary>
/// <param name="method"></param>
void RemoveAssertionInit(Method method)
{
/* We match the following code sequence:
* 0 ldc <class X>
Expand All @@ -1145,22 +1149,31 @@ private void RemoveAssertionInit(Method m)
*/
ConstantPoolItemFieldref fieldref;
Field field;
if (m.Instructions[0].NormalizedOpCode == NormalizedByteCode.__ldc && SafeIsConstantPoolClass(new ClassConstantHandle(checked((ushort)m.Instructions[0].Arg1)))
&& m.Instructions[1].NormalizedOpCode == NormalizedByteCode.__invokevirtual && IsDesiredAssertionStatusMethodref(m.Instructions[1].Arg1)
&& m.Instructions[2].NormalizedOpCode == NormalizedByteCode.__ifne && m.Instructions[2].TargetIndex == 5
&& m.Instructions[3].NormalizedOpCode == NormalizedByteCode.__iconst && m.Instructions[3].Arg1 == 1
&& m.Instructions[4].NormalizedOpCode == NormalizedByteCode.__goto && m.Instructions[4].TargetIndex == 6
&& m.Instructions[5].NormalizedOpCode == NormalizedByteCode.__iconst && m.Instructions[5].Arg1 == 0
&& m.Instructions[6].NormalizedOpCode == NormalizedByteCode.__putstatic && (fieldref = SafeGetFieldref(m.Instructions[6].Arg1)) != null
&& fieldref.Class == Name && fieldref.Signature == "Z"
&& (field = GetField(fieldref.Name, fieldref.Signature)) != null
&& field.IsStatic && field.IsFinal
&& !HasBranchIntoRegion(m.Instructions, 7, m.Instructions.Length, 0, 7)
&& !HasStaticFieldWrite(m.Instructions, 7, m.Instructions.Length, field)
&& !HasExceptionHandlerInRegion(m.ExceptionTable, 0, 7))
if (method.Instructions is [
{ NormalizedOpCode: NormalizedByteCode.__ldc },
{ NormalizedOpCode: NormalizedByteCode.__invokevirtual },
{ NormalizedOpCode: NormalizedByteCode.__ifne },
{ NormalizedOpCode: NormalizedByteCode.__iconst },
{ NormalizedOpCode: NormalizedByteCode.__goto },
{ NormalizedOpCode: NormalizedByteCode.__iconst },
{ NormalizedOpCode: NormalizedByteCode.__putstatic },
..] &&
method.Instructions[0].NormalizedOpCode == NormalizedByteCode.__ldc && SafeIsConstantPoolClass(new ClassConstantHandle(checked((ushort)method.Instructions[0].Arg1))) &&
method.Instructions[1].NormalizedOpCode == NormalizedByteCode.__invokevirtual && IsDesiredAssertionStatusMethodref(method.Instructions[1].Arg1) &&
method.Instructions[2].NormalizedOpCode == NormalizedByteCode.__ifne && method.Instructions[2].TargetIndex == 5 &&
method.Instructions[3].NormalizedOpCode == NormalizedByteCode.__iconst && method.Instructions[3].Arg1 == 1 &&
method.Instructions[4].NormalizedOpCode == NormalizedByteCode.__goto && method.Instructions[4].TargetIndex == 6 &&
method.Instructions[5].NormalizedOpCode == NormalizedByteCode.__iconst && method.Instructions[5].Arg1 == 0 &&
method.Instructions[6].NormalizedOpCode == NormalizedByteCode.__putstatic && (fieldref = SafeGetFieldref(method.Instructions[6].Arg1)) != null &&
fieldref.Class == Name && fieldref.Signature == "Z" &&
(field = GetField(fieldref.Name, fieldref.Signature)) != null &&
field.IsStatic && field.IsFinal &&
!HasBranchIntoRegion(method.Instructions, 7, method.Instructions.Length, 0, 7) &&
!HasStaticFieldWrite(method.Instructions, 7, method.Instructions.Length, field) &&
!HasExceptionHandlerInRegion(method.ExceptionTable, 0, 7))
{
field.PatchConstantValue(true);
m.Instructions[0].PatchOpCode(NormalizedByteCode.__goto, 7);
method.Instructions[0].PatchOpCode(NormalizedByteCode.__goto, 7);
flags |= FLAG_HAS_ASSERTIONS;
}
}
Expand Down
152 changes: 152 additions & 0 deletions src/IKVM.Runtime/System/Index.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if NETSTANDARD2_1
[assembly: TypeForwardedTo(typeof(System.Index))]
#else
using System.Runtime.CompilerServices;

namespace System;

/// <summary>Represent a type can be used to index a collection either from the start or the end.</summary>
/// <remarks>
/// Index is used by the C# compiler to support the new index syntax
/// <code>
/// int[] someArray = new int[5] { 1, 2, 3, 4, 5 } ;
/// int lastElement = someArray[^1]; // lastElement = 5
/// </code>
/// </remarks>
public readonly struct Index : IEquatable<Index>
{
private readonly int _value;

/// <summary>Construct an Index using a value and indicating if the index is from the start or from the end.</summary>
/// <param name="value">The index value. it has to be zero or positive number.</param>
/// <param name="fromEnd">Indicating if the index is from the start or from the end.</param>
/// <remarks>
/// If the Index constructed from the end, index value 1 means pointing at the last element and index value 0 means pointing at beyond last element.
/// </remarks>
#if !NET35
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
public Index(int value, bool fromEnd = false)
{
if (value < 0)
{
throw new ArgumentOutOfRangeException(nameof(value), "value must be non-negative");
}

if (fromEnd)
_value = ~value;
else
_value = value;
}

// The following private constructors mainly created for perf reason to avoid the checks
private Index(int value)
{
_value = value;
}

/// <summary>Create an Index pointing at first element.</summary>
public static Index Start => new Index(0);

/// <summary>Create an Index pointing at beyond last element.</summary>
public static Index End => new Index(~0);

/// <summary>Create an Index from the start at the position indicated by the value.</summary>
/// <param name="value">The index value from the start.</param>
#if !NET35
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
public static Index FromStart(int value)
{
if (value < 0)
{
throw new ArgumentOutOfRangeException(nameof(value), "value must be non-negative");
}

return new Index(value);
}

/// <summary>Create an Index from the end at the position indicated by the value.</summary>
/// <param name="value">The index value from the end.</param>
#if !NET35
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
public static Index FromEnd(int value)
{
if (value < 0)
{
throw new ArgumentOutOfRangeException(nameof(value), "value must be non-negative");
}

return new Index(~value);
}

/// <summary>Returns the index value.</summary>
public int Value
{
get
{
if (_value < 0)
return ~_value;
else
return _value;
}
}

/// <summary>Indicates whether the index is from the start or the end.</summary>
public bool IsFromEnd => _value < 0;

/// <summary>Calculate the offset from the start using the giving collection length.</summary>
/// <param name="length">The length of the collection that the Index will be used with. length has to be a positive value</param>
/// <remarks>
/// For performance reason, we don't validate the input length parameter and the returned offset value against negative values.
/// we don't validate either the returned offset is greater than the input length.
/// It is expected Index will be used with collections which always have non negative length/count. If the returned offset is negative and
/// then used to index a collection will get out of range exception which will be same affect as the validation.
/// </remarks>
#if !NET35
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
public int GetOffset(int length)
{
int offset = _value;
if (IsFromEnd)
{
// offset = length - (~value)
// offset = length + (~(~value) + 1)
// offset = length + value + 1

offset += length + 1;
}
return offset;
}

/// <summary>Indicates whether the current Index object is equal to another object of the same type.</summary>
/// <param name="value">An object to compare with this object</param>
public override bool Equals(object? value) => value is Index && _value == ((Index)value)._value;

/// <summary>Indicates whether the current Index object is equal to another Index object.</summary>
/// <param name="other">An object to compare with this object</param>
public bool Equals(Index other) => _value == other._value;

/// <summary>Returns the hash code for this instance.</summary>
public override int GetHashCode() => _value;

/// <summary>Converts integer number to an Index.</summary>
public static implicit operator Index(int value) => FromStart(value);

/// <summary>Converts the value of the current Index object to its equivalent string representation.</summary>
public override string ToString()
{
if (IsFromEnd)
return "^" + ((uint)Value).ToString();

return ((uint)Value).ToString();
}
}

#endif
95 changes: 95 additions & 0 deletions src/IKVM.Runtime/System/Range.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if NETSTANDARD2_1
[assembly: TypeForwardedTo(typeof(System.Range))]
#else
using System.Runtime.CompilerServices;

namespace System;

/// <summary>Represent a range has start and end indexes.</summary>
/// <remarks>
/// Range is used by the C# compiler to support the range syntax.
/// <code>
/// int[] someArray = new int[5] { 1, 2, 3, 4, 5 };
/// int[] subArray1 = someArray[0..2]; // { 1, 2 }
/// int[] subArray2 = someArray[1..^0]; // { 2, 3, 4, 5 }
/// </code>
/// </remarks>
public readonly struct Range : IEquatable<Range>
{
/// <summary>Represent the inclusive start index of the Range.</summary>
public Index Start { get; }

/// <summary>Represent the exclusive end index of the Range.</summary>
public Index End { get; }

/// <summary>Construct a Range object using the start and end indexes.</summary>
/// <param name="start">Represent the inclusive start index of the range.</param>
/// <param name="end">Represent the exclusive end index of the range.</param>
public Range(Index start, Index end)
{
Start = start;
End = end;
}

/// <summary>Indicates whether the current Range object is equal to another object of the same type.</summary>
/// <param name="value">An object to compare with this object</param>
public override bool Equals(object? value) =>
value is Range r &&
r.Start.Equals(Start) &&
r.End.Equals(End);

/// <summary>Indicates whether the current Range object is equal to another Range object.</summary>
/// <param name="other">An object to compare with this object</param>
public bool Equals(Range other) => other.Start.Equals(Start) && other.End.Equals(End);

/// <summary>Returns the hash code for this instance.</summary>
public override int GetHashCode()
{
return Start.GetHashCode() * 31 + End.GetHashCode();
}

/// <summary>Converts the value of the current Range object to its equivalent string representation.</summary>
public override string ToString()
{
return Start + ".." + End;
}

/// <summary>Create a Range object starting from start index to the end of the collection.</summary>
public static Range StartAt(Index start) => new Range(start, Index.End);

/// <summary>Create a Range object starting from first element in the collection to the end Index.</summary>
public static Range EndAt(Index end) => new Range(Index.Start, end);

/// <summary>Create a Range object starting from first element to the end.</summary>
public static Range All => new Range(Index.Start, Index.End);

/// <summary>Calculate the start offset and length of range object using a collection length.</summary>
/// <param name="length">The length of the collection that the range will be used with. length has to be a positive value.</param>
/// <remarks>
/// For performance reason, we don't validate the input length parameter against negative values.
/// It is expected Range will be used with collections which always have non negative length/count.
/// We validate the range is inside the length scope though.
/// </remarks>
#if !NET35
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
[CLSCompliant(false)]
public (int Offset, int Length) GetOffsetAndLength(int length)
{
int start = Start.GetOffset(length);
int end = End.GetOffset(length);

if ((uint)end > (uint)length || (uint)start > (uint)end)
{
throw new ArgumentOutOfRangeException(nameof(length));
}

return (start, end - start);
}
}

#endif
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#if NETFRAMEWORK



#endif
2 changes: 1 addition & 1 deletion src/IKVM.Util/IKVM.Util.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="IKVM.ByteCode" Version="8.13.0-dev.3" />
<PackageReference Include="IKVM.ByteCode" Version="9.0.0" />
</ItemGroup>

</Project>

0 comments on commit 2460b67

Please sign in to comment.