Initial work

Author: TIHan

src/fsharp/IlxGen.fs

@@ -847,14 +847,14 @@ and IlxGenEnv =
       withinSEH: bool
 
       /// Are we inside of a recursive let binding, while loop, or a for loop?
-      isInLoop: bool
+      inLoop: bool
     }
 
     override __.ToString() = "<IlxGenEnv>"
 
-let SetIsInLoop isInLoop eenv =
-    if eenv.isInLoop = isInLoop then eenv
-    else { eenv with isInLoop = isInLoop }
+let SetInLoop inLoop eenv =
+    if eenv.inLoop = inLoop then eenv
+    else { eenv with inLoop = inLoop }
 
 let ReplaceTyenv tyenv (eenv: IlxGenEnv) = {eenv with tyenv = tyenv }
 
@@ -1911,9 +1911,10 @@ let CodeGenThen cenv mgbuf (entryPointInfo, methodName, eenv, alreadyUsedArgs, c
     let innerVals = entryPointInfo |> List.map (fun (v, kind) -> (v, (kind, start)))
 
     (* Call the given code generator *)
-    codeGenFunction cgbuf {eenv with withinSEH=false
-                                     liveLocals=IntMap.empty()
-                                     innerVals = innerVals}
+    codeGenFunction cgbuf { eenv with withinSEH = false
+                                      liveLocals = IntMap.empty()
+                                      innerVals = innerVals
+                                      inLoop = false }
 
     let locals, maxStack, lab2pc, code, exnSpecs, hasSequencePoints = cgbuf.Close()
 
@@ -2196,7 +2197,7 @@ and GenExprWithStackGuard cenv cgbuf eenv sp expr sequel =
         assert (cenv.exprRecursionDepth = 1)
     with
     | :? System.InsufficientExecutionStackException ->
-        error(InternalError("Expression is too large and/or complex to emit.", expr.Range))
+        error(InternalError(sprintf "Expression is too large and/or complex to emit. Method name: '%s'. Recursive depth: %i." cgbuf.MethodName cenv.exprRecursionDepth, expr.Range))
 
 and GenExprAux (cenv: cenv) (cgbuf: CodeGenBuffer) eenv sp expr sequel =
   let g = cenv.g
@@ -3456,7 +3457,7 @@ and GenTryFinally cenv cgbuf eenv (bodyExpr, handlerExpr, m, resty, spTry, spFin
 //--------------------------------------------------------------------------
 
 and GenForLoop cenv cgbuf eenv (spFor, v, e1, dir, e2, loopBody, m) sequel =
-    let eenv = SetIsInLoop true eenv
+    let eenv = SetInLoop true eenv
     let g = cenv.g
 
     // The JIT/NGen eliminate array-bounds checks for C# loops of form:
@@ -3547,7 +3548,7 @@ and GenForLoop cenv cgbuf eenv (spFor, v, e1, dir, e2, loopBody, m) sequel =
 //--------------------------------------------------------------------------
 
 and GenWhileLoop cenv cgbuf eenv (spWhile, e1, e2, m) sequel =
-    let eenv = SetIsInLoop true eenv
+    let eenv = SetInLoop true eenv
     let finish = CG.GenerateDelayMark cgbuf "while_finish"
     let startTest = CG.GenerateMark cgbuf "startTest"
 
@@ -5150,7 +5151,7 @@ and GenLetRecFixup cenv cgbuf eenv (ilxCloSpec: IlxClosureSpec, e, ilField: ILFi
 
 /// Generate letrec bindings
 and GenLetRecBindings cenv (cgbuf: CodeGenBuffer) eenv (allBinds: Bindings, m) =
-    let eenv = SetIsInLoop true eenv
+    let eenv = SetInLoop true eenv
     // Fix up recursion for non-toplevel recursive bindings
     let bindsPossiblyRequiringFixup =
         allBinds |> List.filter (fun b ->
@@ -5400,7 +5401,7 @@ and GenBindingAfterSequencePoint cenv cgbuf eenv sp (TBind(vspec, rhsExpr, _)) s
         let storage = StorageForVal cenv.g m vspec eenv
         match storage, rhsExpr with
         // locals are zero-init, no need to initialize them, except if you are in a loop and the local is mutable.
-        | Local (_, realloc, _), Expr.Const (Const.Zero, _, _) when not realloc && not (eenv.isInLoop && vspec.IsMutable) ->
+        | Local (_, realloc, _), Expr.Const (Const.Zero, _, _) when not realloc && not (eenv.inLoop && vspec.IsMutable) ->
             CommitStartScope cgbuf startScopeMarkOpt
         | _ ->
             GenBindingRhs cenv cgbuf eenv SPSuppress vspec rhsExpr
@@ -7535,7 +7536,7 @@ let GetEmptyIlxGenEnv (ilg: ILGlobals) ccu =
       innerVals = []
       sigToImplRemapInfo = [] (* "module remap info" *)
       withinSEH = false
-      isInLoop = false }
+      inLoop = false }
 
 type IlxGenResults =
     { ilTypeDefs: ILTypeDef list

tests/fsharp/Compiler/CompilerAssert.fs

@@ -143,7 +143,7 @@ let main argv = 0"""
             ProjectId = None
             SourceFiles = [|"test.fs"|]
 #if !NETCOREAPP
-            OtherOptions = [|"--preferreduilang:en-US";"--warn:5"|]
+            OtherOptions = [|"--preferreduilang:en-US";"--warn:5";"--optimize-"|]
 #else
             OtherOptions =
                 let assemblies = getNetCoreAppReferences |> Array.map (fun x -> sprintf "-r:%s" x)