Merge pull request #16433 from dotnet/merges/main-to-release/dev17.9

Merge main to release/dev17.9
dotnet · Dec 13, 2023 · 2aefcec · 2aefcec
2 parents e328bdd + 8f8bf8f
commit 2aefcec
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 16 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -2,27 +2,39 @@
   "isRoot": true,
   "tools": {
     "dotnet-counters": {
-      "commands": ["dotnet-counters"],
+      "commands": [
+        "dotnet-counters"
+      ],
       "version": "8.0.460601"
     },
     "dotnet-dump": {
-      "commands": ["dotnet-dump"],
+      "commands": [
+        "dotnet-dump"
+      ],
       "version": "8.0.460601"
     },
     "dotnet-gcdump": {
-      "commands": ["dotnet-gcdump"],
+      "commands": [
+        "dotnet-gcdump"
+      ],
       "version": "8.0.460601"
     },
     "dotnet-sos": {
-      "commands": ["dotnet-sos"],
+      "commands": [
+        "dotnet-sos"
+      ],
       "version": "8.0.460601"
     },
     "dotnet-symbol": {
-      "commands": ["dotnet-symbol"],
+      "commands": [
+        "dotnet-symbol"
+      ],
       "version": "1.0.460401"
     },
     "dotnet-trace": {
-      "commands": ["dotnet-trace"],
+      "commands": [
+        "dotnet-trace"
+      ],
       "version": "8.0.460601"
     },
     "fantomas": {
@@ -33,4 +45,4 @@
     }
   },
   "version": 1
-}
+}
diff --git a/docs/release-notes/FSharp.Compiler.Service/8.0.200.md b/docs/release-notes/FSharp.Compiler.Service/8.0.200.md
@@ -3,4 +3,5 @@
 - Parens analysis: fix some parenthesization corner-cases in record expressions - https://github.com/dotnet/fsharp/pull/16370
 - Parens analysis: keep parens in method calls in dot-lambdas - https://github.com/dotnet/fsharp/pull/16395
 - Fixes #16359 - correctly handle imports with 0 length public key tokens - https://github.com/dotnet/fsharp/pull/16363
-- Raise a new error when interfaces with auto properties are implemented on constructor-less types - https://github.com/dotnet/fsharp/pull/16352
+- Raise a new error when interfaces with auto properties are implemented on constructor-less types - https://github.com/dotnet/fsharp/pull/16352
+- Allow usage of `[<TailCall>]` with older `FSharp.Core` package versions - https://github.com/dotnet/fsharp/pull/16373
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23565.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23611.3">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>b5ceed90b72d1b05975dd95fedd86c2455969adb</Sha>
+      <Sha>229464299759d6667e8b907d9c321d31a8dcc123</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23217-02">

diff --git a/src/Compiler/Checking/TailCallChecks.fs b/src/Compiler/Checking/TailCallChecks.fs
@@ -738,10 +738,7 @@ let CheckModuleBinding cenv (isRec: bool) (TBind _ as bind) =
             | Some info -> info.HasNoArgs
             | _ -> false
 
-        if
-            (not isRec || isNotAFunction)
-            && HasFSharpAttribute cenv.g cenv.g.attrib_TailCallAttribute bind.Var.Attribs
-        then
+        if (not isRec || isNotAFunction) && cenv.g.HasTailCallAttrib bind.Var.Attribs then
             warning (Error(FSComp.SR.chkTailCallAttrOnNonRec (), bind.Var.Range))
 
     // Check if a let binding to the result of a rec expression is not inside the rec expression
@@ -807,7 +804,7 @@ and CheckDefnInModule cenv mdef =
                 let mustTailCall =
                     Seq.fold
                         (fun mustTailCall (v: Val) ->
-                            if HasFSharpAttribute cenv.g cenv.g.attrib_TailCallAttribute v.Attribs then
+                            if cenv.g.HasTailCallAttrib v.Attribs then
                                 let newSet = Zset.add v mustTailCall
                                 newSet
                             else

diff --git a/src/Compiler/TypedTree/TcGlobals.fs b/src/Compiler/TypedTree/TcGlobals.fs
@@ -1532,7 +1532,6 @@ type TcGlobals(
   member val attrib_CompilerFeatureRequiredAttribute       = findSysAttrib "System.Runtime.CompilerServices.CompilerFeatureRequiredAttribute"
   member val attrib_SetsRequiredMembersAttribute           = findSysAttrib "System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute"
   member val attrib_RequiredMemberAttribute                = findSysAttrib "System.Runtime.CompilerServices.RequiredMemberAttribute"
-  member val attrib_TailCallAttribute                      = mk_MFCore_attrib "TailCallAttribute"
 
   member g.improveType tcref tinst = improveTy tcref tinst
 
@@ -1870,6 +1869,10 @@ type TcGlobals(
 
   member _.DebuggerNonUserCodeAttribute = debuggerNonUserCodeAttribute
 
+  member _.HasTailCallAttrib (attribs: Attribs) =
+    attribs
+    |> List.exists (fun a -> a.TyconRef.CompiledRepresentationForNamedType.FullName = "Microsoft.FSharp.Core.TailCallAttribute")
+
   member _.MakeInternalsVisibleToAttribute(simpleAssemName) =
       mkILCustomAttribute (tref_InternalsVisibleToAttribute, [ilg.typ_String], [ILAttribElem.String (Some simpleAssemName)], [])
 

diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TailCallAttribute.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/TailCallAttribute.fs
@@ -1486,3 +1486,29 @@ namespace N
               Message =
                            "The TailCall attribute should only be applied to recursive functions." }
         ]
+
+    [<FSharp.Test.FactForNETCOREAPP>]
+    let ``Warn about self-defined attribute`` () = // is the analysis available for users of older FSharp.Core versions
+        """
+module Microsoft.FSharp.Core
+
+    open System
+    
+    [<AttributeUsage(AttributeTargets.Method)>]
+    type TailCallAttribute() = inherit Attribute()
+
+    [<TailCall>]
+    let rec f x = 1 + f x
+        """
+        |> FSharp
+        |> compile
+        |> shouldFail
+        |> withResults [
+            { Error = Warning 3569
+              Range = { StartLine = 10
+                        StartColumn = 23
+                        EndLine = 10
+                        EndColumn = 26 }
+              Message =
+                "The member or function 'f' has the 'TailCallAttribute' attribute, but is not being used in a tail recursive way." }
+        ]
diff --git a/tests/projects/misc/SelfDefinedTailCallAttribute/Attribute.fs b/tests/projects/misc/SelfDefinedTailCallAttribute/Attribute.fs
@@ -0,0 +1,6 @@
+module Microsoft.FSharp.Core
+
+    open System
+
+    [<AttributeUsage(AttributeTargets.Method)>]
+    type TailCallAttribute() = inherit Attribute()
diff --git a/tests/projects/misc/SelfDefinedTailCallAttribute/Program.fs b/tests/projects/misc/SelfDefinedTailCallAttribute/Program.fs
@@ -0,0 +1,13 @@
+namespace N
+
+    module M =
+
+        open Microsoft.FSharp.Core
+
+        [<TailCall>]
+        let rec f x = 1 + f x
+
+        [<EntryPoint>]
+        let main argv =
+            printfn "Hello from F#"
+            0
diff --git a/tests/projects/misc/SelfDefinedTailCallAttribute/tailcallaltattr.fsproj b/tests/projects/misc/SelfDefinedTailCallAttribute/tailcallaltattr.fsproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Debug/net8.0/fsc.dll</DotnetFscCompilerPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Attribute.fs" />
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FSharp.Core" Version="6.0.7" />
+  </ItemGroup>
+</Project>