Reworking the logic to use reflection to invoke the profile. This removes any conditional compilation

glennblock · glennblock · commit df5bd318d003 · 2014-05-10T14:54:35.000-07:00
diff --git a/src/ScriptCs/Program.cs b/src/ScriptCs/Program.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.IO;
+using System.Reflection;
 using System.Runtime;
 using ScriptCs.Argument;
 using ScriptCs.Command;
@@ -13,15 +14,7 @@ internal static class Program
     {
         private static int Main(string[] args)
         {
-#if !__MonoCS__
-            try
-            {
-                SetProfile();
-            }
-            catch (TypeLoadException)
-            {
-            }
-#endif
+            SetProfile();
 
             IConsole console = new ScriptConsole();
 
@@ -93,16 +86,17 @@ private static string[] GetModuleList(string modulesArg)
             return modules;
         }
 
-#if !__MonoCS__
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private static void SetProfile()
         {
-            if (Type.GetType("Mono.Runtime") == null)
+            var profileOptimizationType = Type.GetType("System.Runtime.ProfileOptimization");
+            if (profileOptimizationType != null)
             {
-                ProfileOptimization.SetProfileRoot(typeof(Program).Assembly.Location);
-                ProfileOptimization.StartProfile(typeof(Program).Assembly.GetName().Name + ".profile");
+                var setProfileRoot = profileOptimizationType.GetMethod("SetProfileRoot", BindingFlags.Public | BindingFlags.Static);
+                setProfileRoot.Invoke(null, new object[] {typeof (Program).Assembly.Location});
+
+                var startProfile = profileOptimizationType.GetMethod("StartProfile", BindingFlags.Public | BindingFlags.Static);
+                startProfile.Invoke(null, new object[] {typeof (Program).Assembly.GetName().Name + ".profile"});
             }
         }
-#endif
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using System.Reflection;`
`3`	`4`	`using System.Runtime;`
`4`	`5`	`using ScriptCs.Argument;`
`5`	`6`	`using ScriptCs.Command;`
`@@ -13,15 +14,7 @@ internal static class Program`
`13`	`14`	`{`
`14`	`15`	`private static int Main(string[] args)`
`15`	`16`	`{`
`16`		`-#if !__MonoCS__`
`17`		`- try`
`18`		`- {`
`19`		`- SetProfile();`
`20`		`- }`
`21`		`- catch (TypeLoadException)`
`22`		`- {`
`23`		`- }`
`24`		`-#endif`
	`17`	`+ SetProfile();`
`25`	`18`
`26`	`19`	`IConsole console = new ScriptConsole();`
`27`	`20`
`@@ -93,16 +86,17 @@ private static string[] GetModuleList(string modulesArg)`
`93`	`86`	`return modules;`
`94`	`87`	`}`
`95`	`88`
`96`		`-#if !__MonoCS__`
`97`		`- [MethodImpl(MethodImplOptions.NoInlining)]`
`98`	`89`	`private static void SetProfile()`
`99`	`90`	`{`
`100`		`- if (Type.GetType("Mono.Runtime") == null)`
	`91`	`+ var profileOptimizationType = Type.GetType("System.Runtime.ProfileOptimization");`
	`92`	`+ if (profileOptimizationType != null)`
`101`	`93`	`{`
`102`		`- ProfileOptimization.SetProfileRoot(typeof(Program).Assembly.Location);`
`103`		`- ProfileOptimization.StartProfile(typeof(Program).Assembly.GetName().Name + ".profile");`
	`94`	`+ var setProfileRoot = profileOptimizationType.GetMethod("SetProfileRoot", BindingFlags.Public \| BindingFlags.Static);`
	`95`	`+ setProfileRoot.Invoke(null, new object[] {typeof (Program).Assembly.Location});`
	`96`	`+`
	`97`	`+ var startProfile = profileOptimizationType.GetMethod("StartProfile", BindingFlags.Public \| BindingFlags.Static);`
	`98`	`+ startProfile.Invoke(null, new object[] {typeof (Program).Assembly.GetName().Name + ".profile"});`
`104`	`99`	`}`
`105`	`100`	`}`
`106`		`-#endif`
`107`	`101`	`}`
`108`	`102`	`}`