Merge branch 'main' into copilot/fix-fsharp-optional-parameter-highlighting

Author: T-Gro

eng/Version.Details.props

@@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props
     <MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisFeaturesPackageVersion>
     <MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesPackageVersion>
     <!-- dotnet/arcade dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25612.6</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25615.1</MicrosoftDotNetArcadeSdkPackageVersion>
     <!-- _git/dotnet-optimization dependencies -->
     <optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
     <optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>

eng/Version.Details.xml

@@ -76,9 +76,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25612.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25615.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8adf115288fa51feaa30d063b946478054c7f7b4</Sha>
+      <Sha>059959b98fc4350c619399ae2bf4c7b854779ecf</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

global.json

@@ -22,7 +22,7 @@
     "perl": "5.38.2.2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25612.6",
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25615.1",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
   }
 }

src/Compiler/Interactive/fsi.fs

@@ -2131,7 +2131,8 @@ type internal FsiDynamicCompiler
         if tcConfig.printAst then
             for input in declaredImpls do
                 fprintfn fsiConsoleOutput.Out "AST:"
-                fprintfn fsiConsoleOutput.Out "%+A" input
+                let layout = DebugPrint.implFileL input
+                fprintfn fsiConsoleOutput.Out "%s" (LayoutRender.showL layout)
 #endif
 
         diagnosticsLogger.AbortOnError(fsiConsoleOutput)

src/Compiler/TypedTree/TypedTreeOps.fs

@@ -11225,13 +11225,16 @@ let mkOptimizedRangeLoop (g: TcGlobals) (mBody, mFor, mIn, spInWhile) (rangeTy,
         | RangeCount.PossiblyOversize calc ->
             calc (fun count wouldOvf ->
                 buildLoop count (fun mkBody ->
+                    // mkBody creates expressions that may contain lambdas with unique stamps.
+                    // We need to copy the expression for the second branch to avoid duplicate type names.
+                    let mkBodyCopied idxVar loopVar = copyExpr g CloneAll (mkBody idxVar loopVar)
                     mkCond
                         DebugPointAtBinding.NoneAtInvisible
                         mIn
                         g.unit_ty
                         wouldOvf
                         (mkCountUpInclusive mkBody (tyOfExpr g count))
-                        (mkCompGenLetIn mIn (nameof count) (tyOfExpr g count) count (fun (_, count) -> mkCountUpExclusive mkBody count))))
+                        (mkCompGenLetIn mIn (nameof count) (tyOfExpr g count) count (fun (_, count) -> mkCountUpExclusive mkBodyCopied count))))
     )
 
 let mkDebugPoint m expr = 

tests/FSharp.Compiler.ComponentTests/EmittedIL/ComputedCollections/ForNInRangeArrays.fs

@@ -1,4 +1,4 @@
-let f0 f = [|for n in 1..10 do f (); yield n|]
+let f0 f = [|for n in 1..10 do f (); yield n|]
 let f00 f g = [|for n in 1..10 do f (); g (); yield n|]
 let f000 f = [|for n in 1..10 do f (); yield n; yield n + 1|]
 let f0000 () = [|for n in 1..10 do yield n|]
@@ -42,3 +42,8 @@ let f29 f g = [|let y = f () in let z = g () in for x in 1..2..10 -> x + y + z|]
 let f30 f g = [|let y = f () in g (); for x in 1..2..10 -> x + y|]
 let f31 f g = [|f (); g (); for x in 1..2..10 -> x|]
 let f32 f g = [|f (); let y = g () in for x in 1..2..10 -> x + y|]
+
+// https://github.com/dotnet/fsharp/issues/19156
+let f33 (start : int) (finish : int) f = [|for _ in start..finish -> id id ()|]
+let f34 (start : int64) (finish : int64) f = [|for _ in start..finish -> id id ()|]
+let f35 (start : uint64) (finish : uint64) f = [|for _ in start..finish -> id id ()|]

tests/FSharp.Compiler.ComponentTests/EmittedIL/ComputedCollections/ForNInRangeArrays.fs.il.bsl

@@ -1,4 +1,4 @@
-let f0 f = [for n in 1..10 do f (); yield n]
+let f0 f = [for n in 1..10 do f (); yield n]
 let f00 f g = [|for n in 1..10 do f (); g (); yield n|]
 let f000 f = [for n in 1..10 do f (); yield n; yield n + 1]
 let f0000 () = [for n in 1..10 do yield n]
@@ -42,3 +42,8 @@ let f29 f g = [let y = f () in let z = g () in for x in 1..2..10 -> x + y + z]
 let f30 f g = [let y = f () in g (); for x in 1..2..10 -> x + y]
 let f31 f g = [f (); g (); for x in 1..2..10 -> x]
 let f32 f g = [f (); let y = g () in for x in 1..2..10 -> x + y]
+
+// https://github.com/dotnet/fsharp/issues/19156
+let f33 (start : int) (finish : int) f = [for _ in start..finish -> id id ()]
+let f34 (start : int64) (finish : int64) f = [for _ in start..finish -> id id ()]
+let f35 (start : uint64) (finish : uint64) f = [for _ in start..finish -> id id ()]