From: Aleksey Kliger (λgeek) <akliger@gmail.com>
Date: Wed, 21 Sep 2016 16:49:12 +0000 (-0400)
Subject: [gacutil] Use IKVM.Reflection instead of System.Reflection (#3582)
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=31d66d692fbe1378c68280357f486417ba8ff98d

[gacutil] Use IKVM.Reflection instead of System.Reflection (#3582)


* gacutil should use System.Reflection.Assembly.ReflectionOnlyLoadFrom() since it doesn't need to run the assemblies;
* but in fact, it could also use a managed reflection library. So in this PR we change it to use IKVM.Reflection
---

diff --git a/mcs/tools/gacutil/Makefile b/mcs/tools/gacutil/Makefile
index f98314ecec7..ff66d61364c 100644
--- a/mcs/tools/gacutil/Makefile
+++ b/mcs/tools/gacutil/Makefile
@@ -2,8 +2,8 @@ thisdir = tools/gacutil
 SUBDIRS = 
 include ../../build/rules.make
 
-LIB_REFS = Mono.Security
-LOCAL_MCS_FLAGS = -unsafe
+LIB_REFS = System Mono.Security System.Security
+LOCAL_MCS_FLAGS = -unsafe -define:NO_SYMBOL_WRITER
 
 PROGRAM = gacutil.exe
 
diff --git a/mcs/tools/gacutil/driver.cs b/mcs/tools/gacutil/driver.cs
index 13f686e22c6..47c4ac8df96 100644
--- a/mcs/tools/gacutil/driver.cs
+++ b/mcs/tools/gacutil/driver.cs
@@ -14,7 +14,6 @@ using System;
 using System.IO;
 using System.Diagnostics;
 using System.Text;
-using System.Reflection;
 using System.Collections;
 using System.Globalization;
 using System.Runtime.InteropServices;
@@ -23,6 +22,8 @@ using System.Security.Cryptography;
 using Mono.Security;
 using Mono.Security.Cryptography;
 
+using IKVM.Reflection;
+
 namespace Mono.Tools {
 
 	public class Driver {
@@ -48,6 +49,7 @@ namespace Mono.Tools {
 
 		private static bool silent;
 		static bool in_bootstrap;
+		private static Universe _universe;
 
 		public static int Main (string [] args)
 		{
@@ -244,7 +246,7 @@ namespace Mono.Tools {
 			AssemblyName an = null;
 
 			try {
-				assembly = Assembly.LoadFrom (name);
+				assembly = ReflectionOnlyLoadFrom (name);
 			} catch {
 				WriteLine (string.Format (failure_msg, name) + "The file specified is not a valid assembly.");
 				return false;
@@ -744,12 +746,27 @@ namespace Mono.Tools {
 			}
 		}
 
+		private static Universe GetUniverse () {
+			if (_universe == null) {
+				_universe = new Universe (UniverseOptions.MetadataOnly);
+			}
+			return _universe;
+		}
+
+		private static Assembly ReflectionOnlyLoadFrom (string fileName)
+		{
+			return GetUniverse ().LoadFile (fileName);
+		}
+		private static AssemblyName GetCorlibName ()
+		{
+			return GetUniverse ().Mscorlib.GetName ();
+		}
+
 		private static bool CheckReferencedAssemblies (AssemblyName an)
 		{
-			AppDomain d = null;
 			try {
-				Assembly a = Assembly.LoadFrom (an.CodeBase);
-				AssemblyName corlib = typeof (object).Assembly.GetName ();
+				Assembly a = ReflectionOnlyLoadFrom (an.CodeBase);
+				AssemblyName corlib = GetCorlibName ();
 
 				foreach (AssemblyName ref_an in a.GetReferencedAssemblies ()) {
 					if (ref_an.Name == corlib.Name) // Just do a string compare so we can install on diff versions
@@ -763,12 +780,6 @@ namespace Mono.Tools {
 			} catch (Exception e) {
 				WriteLine (e.ToString ()); // This should be removed pre beta3
 				return false;
-			} finally {
-				if (d != null) {
-					try {
-						AppDomain.Unload (d);
-					} catch { }
-				}
 			}
 
 			return true;
@@ -800,8 +811,8 @@ namespace Mono.Tools {
 
 		static bool LoadConfig (bool quiet)
 		{
-			MethodInfo config = typeof (System.Environment).GetMethod ("GetMachineConfigPath",
-				BindingFlags.Static | BindingFlags.NonPublic);
+			System.Reflection.MethodInfo config = typeof (System.Environment).GetMethod ("GetMachineConfigPath",
+				System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);
 
 			if (config != null) {
 				string path = (string) config.Invoke (null, null);
@@ -832,7 +843,7 @@ namespace Mono.Tools {
 
 			// Note: MustVerify is based on the original token (by design). Public key
 			// remapping won't affect if the assembly is verified or not.
-			if (StrongNameManager.MustVerify (an)) {
+			if (StrongNameManager.MustVerify (new System.Reflection.AssemblyName (an.FullName))) {
 				RSA rsa = CryptoConvert.FromCapiPublicKeyBlob (publicKey, 12);
 				StrongName sn = new StrongName (rsa);
 				if (sn.Verify (assemblyFile)) {
@@ -899,20 +910,20 @@ namespace Mono.Tools {
 		public static extern int symlink (string oldpath, string newpath);
 
 		private static string GetGacDir () {
-			PropertyInfo gac = typeof (System.Environment).GetProperty ("GacPath",
-					BindingFlags.Static|BindingFlags.NonPublic);
+			System.Reflection.PropertyInfo gac = typeof (System.Environment).GetProperty ("GacPath",
+					System.Reflection.BindingFlags.Static|System.Reflection.BindingFlags.NonPublic);
 			if (gac == null) {
 				WriteLine ("ERROR: Mono runtime not detected, please use " +
 						"the mono runtime for gacutil.exe");
 				Environment.Exit (1);
 			}
-			MethodInfo get_gac = gac.GetGetMethod (true);
+			System.Reflection.MethodInfo get_gac = gac.GetGetMethod (true);
 			return (string) get_gac.Invoke (null, null);
 		}
 
 		private static string GetLibDir () {
-			MethodInfo libdir = typeof (System.Environment).GetMethod ("internalGetGacPath",
-					BindingFlags.Static|BindingFlags.NonPublic);
+			System.Reflection.MethodInfo libdir = typeof (System.Environment).GetMethod ("internalGetGacPath",
+					System.Reflection.BindingFlags.Static|System.Reflection.BindingFlags.NonPublic);
 			if (libdir == null) {
 				WriteLine ("ERROR: Mono runtime not detected, please use " +
 						"the mono runtime for gacutil.exe");
diff --git a/mcs/tools/gacutil/gacutil.exe.sources b/mcs/tools/gacutil/gacutil.exe.sources
index 911afaf9d82..4772378b43c 100644
--- a/mcs/tools/gacutil/gacutil.exe.sources
+++ b/mcs/tools/gacutil/gacutil.exe.sources
@@ -1,2 +1,9 @@
 driver.cs
 ../security/StrongNameManager.cs
+../../../external/ikvm/reflect/*.cs
+../../../external/ikvm/reflect/Metadata/*.cs
+../../../external/ikvm/reflect/Emit/*.cs
+../../../external/ikvm/reflect/Reader/*.cs
+../../../external/ikvm/reflect/Writer/*.cs
+../../../external/ikvm/reflect/Impl/ITypeOwner.cs
+../../../external/ikvm/reflect/Impl/SymbolSupport.cs