max memory trigger (2)

Author: dsyme

src/fsharp/fsi/fsi.fs

@@ -2362,11 +2362,14 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i
 
     let fsiConsoleInput = FsiConsoleInput(fsi, fsiOptions, inReader, outWriter)
 
-    let frameworkImportsCache = IncrementalFSharpBuild.FrameworkImportsCache(1)
+    /// The single, global interactive checker that can be safely used in conjunction with other operations
+    /// on the FsiEvaluationSession.  
+    let checker = FSharpChecker.Create()
+
     let (tcGlobals,frameworkTcImports,nonFrameworkResolutions,unresolvedReferences) = 
         try 
             let tcConfig = tcConfigP.Get()
-            frameworkImportsCache.Get tcConfig
+            checker.FrameworkImportsCache.Get tcConfig
         with e -> 
             stopProcessingRecovery e range0; failwithf "Error creating evaluation session: %A" e
 
@@ -2410,9 +2413,6 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i
 
     let fsiInteractionProcessor = FsiInteractionProcessor(fsi, tcConfigB, errorLogger, fsiOptions, fsiDynamicCompiler, fsiConsolePrompt, fsiConsoleOutput, fsiInterruptController, fsiStdinLexerProvider, lexResourceManager, initialInteractiveState) 
 
-    /// The single, global interactive checker that can be safely used in conjunction with other operations
-    /// on the FsiEvaluationSession.  
-    let checker = InteractiveChecker.Create()
 
     interface IDisposable with 
         member x.Dispose() = 

src/fsharp/vs/service.fs

@@ -2519,6 +2519,7 @@ type BackgroundCompiler(projectCacheSize, keepAssemblyContents, keepAllBackgroun
             frameworkTcImportsCache.Downsize()
             scriptClosureCache.Resize(keepStrongly=1, keepMax=1))
 
+    member __.FrameworkImportsCache = frameworkTcImportsCache
 
 #if SILVERLIGHT
 #else
@@ -3183,6 +3184,7 @@ type FSharpChecker(projectCacheSize, keepAssemblyContents, keepAllBackgroundReso
     member ic.MaxMemory with get() = maxMB and set v = maxMB <- v
 
     static member Instance = globalInstance
+    member internal __.FrameworkImportsCache = backgroundCompiler.FrameworkImportsCache
 
 type FsiInteractiveChecker(reactorOps: IReactorOperations, tcConfig, tcGlobals, tcImports, tcState, loadClosure) =
     let keepAssemblyContents = false

src/fsharp/vs/service.fsi

@@ -701,6 +701,7 @@ type FSharpChecker =
     
     // One shared global singleton for use by multiple add-ins
     static member Instance : FSharpChecker
+    member internal FrameworkImportsCache : IncrementalFSharpBuild.FrameworkImportsCache
 
 
 // An object to typecheck source in a given typechecking environment.