avoid eager dereferencing when building globals

Author: dsyme

src/fsharp/CompileOps.fs

@@ -3793,10 +3793,6 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
                 | None -> false
         | None -> false
 
-    member tcImports.SetBase(baseTcImports) =
-        CheckDisposed()
-        importsBase <- Some(baseTcImports)
-
     member private tcImports.Base  = 
             CheckDisposed()
             importsBase
@@ -4078,7 +4074,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
         | None -> 
             match importsBase with 
             | Some b -> b.GetTcGlobals() 
-            | None -> failwith "unreachable: GetGlobals - are the references to mscorlib.dll and FSharp.Core.dll valid?"
+            | None -> failwith (sprintf "unreachable: GetGlobals - are the references to mscorlib.dll and FSharp.Core.dll valid? STACK: \n%s" ((System.Diagnostics.StackTrace()).ToString()))
 
     member private tcImports.SetILGlobals ilg =
         CheckDisposed()

src/fsharp/CompileOps.fsi

@@ -598,7 +598,6 @@ type TcAssemblyResolutions =
 type TcImports =
     interface System.IDisposable
     //new : TcImports option -> TcImports
-    member SetBase : TcImports -> unit
     member DllTable : NameMap<ImportedBinary> with get
     member GetImportedAssemblies : unit -> ImportedAssembly list
     member GetCcusInDeclOrder : unit -> CcuThunk list

src/fsharp/TcGlobals.fs

@@ -1336,25 +1336,31 @@ let mkTcGlobals (compilingFslib,sysCcu,ilg,fslibCcu,directoryToResolveRelativePa
             // the TyconRef's we have in our hands, hence we can't dereference them to find their stamps.
 
             // So this dictionary is indexed by names.
+            //
+            // Make it lazy to avoid dereferencing while setting up the base imports. 
             let dict = 
+              lazy
                 entries 
                 |> List.map (fun (nm,tcref,builder) -> nm, (fun tcref2 tinst -> if tyconRefEq tcref tcref2 then Some(builder tinst) else None)) 
                 |> Dictionary.ofList  
             (fun tcref tinst -> 
-                 if dict.ContainsKey tcref.LogicalName then dict.[tcref.LogicalName] tcref tinst
+                 if dict.Value.ContainsKey tcref.LogicalName then dict.Value.[tcref.LogicalName] tcref tinst
                  else None )  
         else
             // This map is for use in normal times (not building FSharp.Core.dll). It is indexed by tcref stamp which is 
             // faster than the indexing technique used in the case above.
             //
             // So this dictionary is indexed by integers.
+            //
+            // Make it lazy to avoid dereferencing while setting up the base imports. 
             let dict = 
+              lazy
                 entries  
                 |> List.filter (fun (_,tcref,_) -> tcref.CanDeref) 
                 |> List.map (fun (_,tcref,builder) -> tcref.Stamp, builder) 
                 |> Dictionary.ofList 
             (fun tcref2 tinst -> 
-                 if dict.ContainsKey tcref2.Stamp then Some(dict.[tcref2.Stamp] tinst)
+                 if dict.Value.ContainsKey tcref2.Stamp then Some(dict.Value.[tcref2.Stamp] tinst)
                  else None)  
        end
 

tests/service/Common.fs

@@ -67,9 +67,9 @@ let mkProjectCommandLineArgs (dllName, fileNames) =
         yield "--noframework" 
         yield "--debug:full" 
         yield "--define:DEBUG" 
-//#if NETCOREAPP1_0
+#if NETCOREAPP1_0
         yield "--targetprofile:netcore" 
-//#endif
+#endif
         yield "--optimize-" 
         yield "--out:" + dllName
         yield "--doc:test.xml" 
@@ -103,9 +103,9 @@ let mkProjectCommandLineArgsForScript (dllName, fileNames) =
         yield "--noframework" 
         yield "--debug:full" 
         yield "--define:DEBUG" 
-//#if NETCOREAPP1_0
+#if NETCOREAPP1_0
         yield "--targetprofile:netcore" 
-//#endif
+#endif
         yield "--optimize-" 
         yield "--out:" + dllName
         yield "--doc:test.xml" 
@@ -115,15 +115,12 @@ let mkProjectCommandLineArgsForScript (dllName, fileNames) =
         yield "--target:library" 
         for x in fileNames do 
             yield x
-        let implDir = Path.GetDirectoryName(typeof<System.Object>.Assembly.Location)
+    //    let implDir = Path.GetDirectoryName(typeof<System.Object>.Assembly.Location)
         let references =
-            [ yield Path.Combine(implDir,"mscorlib.dll"); 
-              yield Path.Combine(implDir,"System.Private.CoreLib.dll"); 
-              yield! Path.Combine(__SOURCE_DIRECTORY__, "../projects/Sample_NETCoreSDK_FSharp_Library_netstandard1.6/obj/Debug/netstandard1.6/dotnet-compile-fsc.rsp")
-                        |> File.ReadAllLines
-                        |> Array.filter (fun s -> s.StartsWith("-r:"))
-                        |> Array.map (fun s -> s.Replace("-r:",""))
-                        |> Array.map (fun s -> Path.Combine(implDir,s)) ]
+            Path.Combine(__SOURCE_DIRECTORY__, "../projects/Sample_NETCoreSDK_FSharp_Library_netstandard1.6/obj/Debug/netstandard1.6/dotnet-compile-fsc.rsp")
+            |> File.ReadAllLines
+            |> Array.filter (fun s -> s.StartsWith("-r:"))
+            |> Array.map (fun s -> s.Replace("-r:",""))
         for r in references do
             yield "-r:" + r
      |]