Inline NoDynamicInvocation functions

Author: auduchinok

src/Compiler/Optimize/Optimizer.fs

@@ -2341,6 +2341,17 @@ let inline IsStateMachineExpr g overallExpr =
         isReturnsResumableCodeTy g valRef.TauType
     | _ -> false
 
+let shouldForceInlineMembersInDebug (g: TcGlobals) (tcref: EntityRef) =
+    match g.fslibForceInlineModules.TryGetValue tcref.LogicalName with
+    | true, modRef -> tyconRefEq g tcref modRef 
+    | _ -> false
+
+let shouldForceInlineInDebug (g: TcGlobals) (vref: ValRef) : bool =
+    ValHasWellKnownAttribute g WellKnownValAttributes.NoDynamicInvocationAttribute_True vref.Deref ||
+    ValHasWellKnownAttribute g WellKnownValAttributes.NoDynamicInvocationAttribute_False vref.Deref ||
+
+    vref.HasDeclaringEntity && shouldForceInlineMembersInDebug g vref.DeclaringEntity
+
 /// Optimize/analyze an expression
 let rec OptimizeExpr cenv (env: IncrementalOptimizationEnv) expr =
     cenv.stackGuard.Guard <| fun () ->
@@ -3432,7 +3443,7 @@ and TryInlineApplication cenv env finfo (valExpr: Expr) (tyargs: TType list, arg
     let g = cenv.g
 
     match cenv.settings.inlineNamedFunctions, stripExpr valExpr with
-    | false, Expr.Val(vref, _, _) when vref.ShouldInline ->
+    | false, Expr.Val(vref, _, _) when vref.ShouldInline && not (shouldForceInlineInDebug cenv.g vref) ->
         let origFinfo = GetInfoForValWithCheck cenv env m vref
         match stripValue origFinfo.ValExprInfo with
         | CurriedLambdaValue(origLambdaId, _, _, origLambda, origLambdaTy) when not (Zset.contains origLambdaId env.dontInline) ->

src/Compiler/TypedTree/TcGlobals.fs

@@ -646,6 +646,15 @@ type TcGlobals(
 
                     yield nleref.LastItemMangledName, ERefNonLocal nleref  ]
 
+  let v_FSharpCoreForceInlineModules =
+     dict [ for nleref in [ fslib_MFIntrinsicOperators_nleref
+                            fslib_MFOperators_nleref
+                            fslib_MFOperatorIntrinsics_nleref
+                            fslib_MFOperatorsChecked_nleref
+                            fslib_MFNativePtrModule_nleref  ] do
+
+                    yield nleref.LastItemMangledName, ERefNonLocal nleref  ]
+
   let tryDecodeTupleTy tupInfo l =
       match l with
       | [t1;t2;t3;t4;t5;t6;t7;markerTy] ->
@@ -1133,6 +1142,8 @@ type TcGlobals(
   // better the job we do of mapping from provided expressions back to FSharp.Core F# functions and values.
   member _.knownFSharpCoreModules = v_knownFSharpCoreModules
 
+  member _.fslibForceInlineModules = v_FSharpCoreForceInlineModules
+
   member _.compilingFSharpCore = compilingFSharpCore
 
   member _.useReflectionFreeCodeGen = useReflectionFreeCodeGen

src/Compiler/TypedTree/TcGlobals.fsi

@@ -698,6 +698,8 @@ type internal TcGlobals =
 
     member knownFSharpCoreModules: System.Collections.Generic.IDictionary<string, TypedTree.EntityRef>
 
+    member fslibForceInlineModules: System.Collections.Generic.IDictionary<string, TypedTree.EntityRef>
+
     member knownIntrinsics:
         System.Collections.Concurrent.ConcurrentDictionary<string * string option * string * int, TypedTree.ValRef>
 

tests/FSharp.Compiler.ComponentTests/EmittedIL/DebugInlineAsCall.fs

@@ -158,8 +158,7 @@ let main _ =
         |> withNoOptimize
         |> asExe
         |> compileAndRun
-        |> verifyILContains ["call       bool [FSharp.Core]Microsoft.FSharp.Core.Operators::Not(bool)"]
-        |> shouldSucceed
+        |> verifyILNotPresent ["call       bool [FSharp.Core]Microsoft.FSharp.Core.Operators::Not(bool)"]
 
     [<Fact>]
     let ``Call 10 - Different assembly`` () =