Fantomas

Author: auduchinok

src/Compiler/CodeGen/IlxGen.fs

@@ -8568,59 +8568,34 @@ and GenBindingAfterDebugPoint cenv cgbuf eenv bind isStateVar startMarkOpt =
         GenExpr cenv cgbuf eenv cctorBody discard
 
     | Method(valReprInfo, _, mspec, mspecW, _, ctps, mtps, curriedArgInfos, paramInfos, witnessInfos, argTys, retInfo) when not isStateVar ->
-        if vspec.InlineInfo = ValInline.InlinedDefinition && not (cenv.emittedSpecializedInlineVals.Add(vspec.Stamp)) then
-            CommitStartScope cgbuf startMarkOpt else
+        if
+            vspec.InlineInfo = ValInline.InlinedDefinition
+            && not (cenv.emittedSpecializedInlineVals.Add(vspec.Stamp))
+        then
+            CommitStartScope cgbuf startMarkOpt
+        else
 
-        let methLambdaTypars, methLambdaCtorThisValOpt, methLambdaBaseValOpt, methLambdaCurriedVars, methLambdaBody, methLambdaBodyTy =
-            IteratedAdjustLambdaToMatchValReprInfo g cenv.amap valReprInfo rhsExpr
+            let methLambdaTypars, methLambdaCtorThisValOpt, methLambdaBaseValOpt, methLambdaCurriedVars, methLambdaBody, methLambdaBodyTy =
+                IteratedAdjustLambdaToMatchValReprInfo g cenv.amap valReprInfo rhsExpr
 
-        let methLambdaVars = List.concat methLambdaCurriedVars
+            let methLambdaVars = List.concat methLambdaCurriedVars
 
-        CommitStartScope cgbuf startMarkOpt
+            CommitStartScope cgbuf startMarkOpt
 
-        let hasWitnessEntry = cenv.g.generateWitnesses && not witnessInfos.IsEmpty
-
-        GenMethodForBinding
-            cenv
-            cgbuf.mgbuf
-            eenv
-            (vspec,
-             mspec,
-             hasWitnessEntry,
-             false,
-             access,
-             ctps,
-             mtps,
-             [],
-             curriedArgInfos,
-             paramInfos,
-             argTys,
-             retInfo,
-             valReprInfo,
-             methLambdaCtorThisValOpt,
-             methLambdaBaseValOpt,
-             methLambdaTypars,
-             methLambdaVars,
-             methLambdaBody,
-             methLambdaBodyTy)
-
-        // If generating witnesses, then generate the second entry point with additional arguments.
-        // Take a copy of the expression to ensure generated names are unique.
-        if hasWitnessEntry then
-            let copyOfLambdaBody = copyExpr cenv.g CloneAll methLambdaBody
+            let hasWitnessEntry = cenv.g.generateWitnesses && not witnessInfos.IsEmpty
 
             GenMethodForBinding
                 cenv
                 cgbuf.mgbuf
                 eenv
                 (vspec,
-                 mspecW,
+                 mspec,
                  hasWitnessEntry,
-                 true,
+                 false,
                  access,
                  ctps,
                  mtps,
-                 witnessInfos,
+                 [],
                  curriedArgInfos,
                  paramInfos,
                  argTys,
@@ -8630,9 +8605,38 @@ and GenBindingAfterDebugPoint cenv cgbuf eenv bind isStateVar startMarkOpt =
                  methLambdaBaseValOpt,
                  methLambdaTypars,
                  methLambdaVars,
-                 copyOfLambdaBody,
+                 methLambdaBody,
                  methLambdaBodyTy)
 
+            // If generating witnesses, then generate the second entry point with additional arguments.
+            // Take a copy of the expression to ensure generated names are unique.
+            if hasWitnessEntry then
+                let copyOfLambdaBody = copyExpr cenv.g CloneAll methLambdaBody
+
+                GenMethodForBinding
+                    cenv
+                    cgbuf.mgbuf
+                    eenv
+                    (vspec,
+                     mspecW,
+                     hasWitnessEntry,
+                     true,
+                     access,
+                     ctps,
+                     mtps,
+                     witnessInfos,
+                     curriedArgInfos,
+                     paramInfos,
+                     argTys,
+                     retInfo,
+                     valReprInfo,
+                     methLambdaCtorThisValOpt,
+                     methLambdaBaseValOpt,
+                     methLambdaTypars,
+                     methLambdaVars,
+                     copyOfLambdaBody,
+                     methLambdaBodyTy)
+
     | StaticProperty(ilGetterMethSpec, optShadowLocal) when not isStateVar ->
 
         let ilAttribs = GenAttrs cenv eenv vspec.Attribs