IKVM.NET 8.6.5.1: fixed SERVE compiler bugs + friends access for the …

…IKVM.NET Next Generation Platform
jessiepathfinder · Jan 12, 2020 · 3bac85c · 3bac85c
1 parent 12fb6b4
commit 3bac85c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 28 deletions.
diff --git a/CommonAssemblyInfo.cs.in b/CommonAssemblyInfo.cs.in
@@ -26,10 +26,10 @@ using System.Reflection;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Jessie Lesbian (based on work by Jeroen Frijters and Windward Studios)")]
 [assembly: AssemblyProduct("IKVM.NET")]
-[assembly: AssemblyCopyright("Copyright (C) 2019 Jessie Lesbian (based on work by Jeroen Frijters and Windward Studios)")]
+[assembly: AssemblyCopyright("Copyright (C) 2020 Jessie Lesbian (based on work by Jeroen Frijters and Windward Studios)")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("8.6.5.0")]
+[assembly: AssemblyVersion("8.6.5.1")]
 
 #if SIGNCODE
 	#pragma warning disable 1699

diff --git a/ikvmc/ikvmc.build b/ikvmc/ikvmc.build
@@ -26,7 +26,7 @@
     <include buildfile="../ikvm.include" />
 
     <target name="ikvmc">
-        <property name="defs" value="TRACE;FIRST_PASS;STATIC_COMPILER;EMITTERS" />
+        <property name="defs" value="TRACE;STATIC_COMPILER;EMITTERS" />
         <if test="${property::exists('signed')}">
             <property name="defs" value="${defs};${signed}" />
         </if>

diff --git a/ikvmstub/ikvmstub.build b/ikvmstub/ikvmstub.build
@@ -26,7 +26,7 @@
     <include buildfile="../ikvm.include" />
 
     <target name="ikvmstub">
-        <property name="defs" value="FIRST_PASS;STUB_GENERATOR;TRACE" />
+        <property name="defs" value="STUB_GENERATOR;TRACE" />
         <if test="${property::exists('signed')}">
             <property name="defs" value="${defs};${signed}" />
         </if>

diff --git a/openjdk/commonAttributes.class b/openjdk/commonAttributes.class
diff --git a/openjdk/java/lang/PropertyConstants.class b/openjdk/java/lang/PropertyConstants.class
diff --git a/runtime/AssemblyInfo.cs b/runtime/AssemblyInfo.cs
@@ -55,3 +55,5 @@ Jeroen Frijters
 [assembly: InternalsVisibleTo("IKVM.OpenJDK.Remoting")]
 [assembly: InternalsVisibleTo("IKVM.OpenJDK.SwingAWT")]
 #endif
+[assembly: InternalsVisibleTo("ikvm2")]
+[assembly: InternalsVisibleTo("ikvmc2")]
diff --git a/runtime/AssemblyInfo.cs.in b/runtime/AssemblyInfo.cs.in
@@ -55,3 +55,5 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("IKVM.OpenJDK.Remoting")]
 [assembly: InternalsVisibleTo("IKVM.OpenJDK.SwingAWT")]
 #endif
+[assembly: InternalsVisibleTo("ikvm2")]
+[assembly: InternalsVisibleTo("ikvmc2")]
diff --git a/runtime/jessielesbian.cs b/runtime/jessielesbian.cs
@@ -1,12 +1,19 @@
 using System;
 using IKVM.Internal;
 using System.Reflection;
+using System.Reflection.Emit;
 using Instruction = IKVM.Internal.ClassFile.Method.Instruction;
 
 //Do you believe in high-quality code by Female/LGBT programmers? Leave u/jessielesbian a PM on Reddit!
 
+[assembly: jessielesbian.IKVM.MadeByLGBTProgrammers]
+
 namespace jessielesbian.IKVM
 {
+	public class MadeByLGBTProgrammersAttribute : Attribute
+	{
+
+	}
 	public static class Helper
 	{
 		static Helper()
@@ -22,7 +29,7 @@ internal static bool experimentalOptimizations
 		{
 			get
 			{
-				return (optpasses > 0);
+				return (optpasses > 0) || extremeOptimizations;
 			}
 		}
 		private static Instruction GetInstuction(NormalizedByteCode bc)
@@ -311,7 +318,7 @@ internal static Instruction[] Optimize(Instruction[] instructions)
 							optimizations = optimizations + 1;
 						}
 					}
-					//peephole optimization: remove unnecessary swaps + branch optimizations
+					//peephole optimization: remove unnecessary swaps
 					if (prev.NormalizedOpCode == NormalizedByteCode.__swap)
 					{
 						switch (current.NormalizedOpCode)
@@ -336,34 +343,13 @@ internal static Instruction[] Optimize(Instruction[] instructions)
 						current = GetInstuction(NormalizedByteCode.__nop);
 						optimizations = optimizations + 1;
 					}
-					//peephole optimization: return optimization
-					if (current.NormalizedOpCode == NormalizedByteCode.__return)
-					{
-						switch (prev.NormalizedOpCode)
-						{
-							case NormalizedByteCode.__dup:
-								prev = GetInstuction(NormalizedByteCode.__nop);
-								optimizations = optimizations + 1;
-								break;
-							case NormalizedByteCode.__swap:
-								prev = GetInstuction(NormalizedByteCode.__pop);
-								optimizations = optimizations + 1;
-								break;
-							default:
-								break;
-						}
-					}
 					instructions[i] = current;
 					instructions[prevIndex] = prev;
 				}
 			}
 			return instructions;
 		}
 		internal static readonly MethodInfo ArrayLoad;
-		internal static readonly MethodInfo ArrayStore; 
-		public static object aaload(Array array, int index)
-		{
-			return array.GetValue(index);
-		}
+		internal static readonly MethodInfo ArrayStore;
 	}
 }