CLJCLR-166 loading of core.clj and related should use direct linking

Author: dmiller

Clojure/Clojure/CljCompiler/Compiler.cs

@@ -205,7 +205,7 @@ public static object GetCompilerOption(Keyword k)
             return RT.get(CompilerOptionsVar.deref(), k);
         }
 
-        static void InitializeCompilerOptions()
+        internal static void InitializeCompilerOptions()
         {
             Object compilerOptions = null;
 
@@ -469,7 +469,8 @@ static Compiler()
             Methods_IFn_invoke[Compiler.MaxPositionalArity + 1]
                 = typeof(IFn).GetMethod("invoke", types);
 
-            InitializeCompilerOptions();
+            // Moved this to clojure.lang.RT's static constructor because we need to bind *compiler-options* there.
+            // InitializeCompilerOptions();
         }
 
         #endregion

Clojure/Clojure/Lib/RT.cs

@@ -442,8 +442,25 @@ static RT()
                 // this is okay.  It just means that the assets clojure/core.clj and company are going to be somewhere else
             }
 
+            // Moved the intiailization of *compiler-options* from the clojure.lang.Compiler static constructor to here.
+            // We need to make sure direct linking is turned on for this load (and later on for the load of the spec files)
+
+            Compiler.InitializeCompilerOptions();
+
             if (RuntimeBootstrapFlag._doRTBootstrap)
-                load("clojure/core");
+            {
+                var optionsMapToUse = (Associative)Compiler.CompilerOptionsVar.deref() ?? PersistentHashMap.EMPTY;
+                Var.pushThreadBindings(RT.map(Compiler.CompilerOptionsVar, optionsMapToUse.assoc(Compiler.DirectLinkingKeyword, true)));
+
+                try
+                {
+                    load("clojure/core");
+                }
+                finally
+                {
+                    Var.popThreadBindings();
+                }
+            }
         }
 
         public static void LoadSpecCode()
@@ -478,12 +495,20 @@ static void DoInit()
 
 
             // load spec
+            var optionsMapToUse = (Associative)Compiler.CompilerOptionsVar.deref() ?? PersistentHashMap.EMPTY;
+            Var.pushThreadBindings(RT.map(Compiler.CompilerOptionsVar, optionsMapToUse.assoc(Compiler.DirectLinkingKeyword, true)));
+
+            try
             {
                 string baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
                 Assembly.LoadFile(Path.Combine(baseDir, "clojure.spec.alpha.dll"));
                 Assembly.LoadFile(Path.Combine(baseDir, "clojure.core.specs.alpha.dll"));
             }
+            finally
+            {
+                Var.popThreadBindings();
+            }
 
             PostBootstrapInit();