Merge pull request #12114 from dotnet/merges/main-to-release/dev17.0

Merge main to release/dev17.0

Author: dotnet-bot

eng/Version.Details.xml

@@ -8,9 +8,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21452.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21456.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>00949c51badfda4edd51d217a82ba607db7c4576</Sha>
+      <Sha>7309c692126e24bc10702f39fe45b2a295b224d2</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>

global.json

@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21452.4",
+    "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21456.1",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }

src/fsharp/CompilerConfig.fs

@@ -663,7 +663,7 @@ type TcConfigBuilder =
           internalTestSpanStackReferring = false
           noConditionalErasure = false
           pathMap = PathMap.empty
-          langVersion = LanguageVersion("default")
+          langVersion = LanguageVersion.Default
           implicitIncludeDir = implicitIncludeDir
           defaultFSharpBinariesDir = defaultFSharpBinariesDir
           reduceMemoryUsage = reduceMemoryUsage

src/fsharp/ErrorLogger.fs

@@ -502,6 +502,8 @@ let deprecatedOperator m = deprecatedWithError (FSComp.SR.elDeprecatedOperator()
 
 let mlCompatWarning s m = warning(UserCompilerMessage(FSComp.SR.mlCompatMessage s, 62, m))
 
+let mlCompatError s m = errorR(UserCompilerMessage(FSComp.SR.mlCompatError s, 62, m))
+
 let suppressErrorReporting f =
     let errorLogger = CompileThreadStatic.ErrorLogger
     try

src/fsharp/ErrorLogger.fsi

@@ -234,7 +234,9 @@ val libraryOnlyWarning: m:range -> unit
 
 val deprecatedOperator: m:range -> unit
 
-val mlCompatWarning: s:String -> m:range -> unit
+val mlCompatWarning: s:string -> m:range -> unit
+
+val mlCompatError: s:string -> m:range -> unit
 
 val suppressErrorReporting: f:(unit -> 'a) -> 'a
 

src/fsharp/FSComp.txt

@@ -52,6 +52,8 @@ tupleRequiredInAbstractMethod,"\nA tuple type is required for one or more argume
 224,buildOptionRequiresParameter,"Option requires parameter: %s"
 225,buildCouldNotFindSourceFile,"Source file '%s' could not be found"
 226,buildInvalidSourceFileExtension,"The file extension of '%s' is not recognized. Source files must have extension .fs, .fsi, .fsx, .fsscript, .ml or .mli."
+226,buildInvalidSourceFileExtensionUpdated,"The file extension of '%s' is not recognized. Source files must have extension .fs, .fsi, .fsx or .fsscript"
+226,buildInvalidSourceFileExtensionML,"The file extension of '%s' is not recognized. Source files must have extension .fs, .fsi, .fsx or .fsscript. To enable the deprecated use of .ml or .mli extensions, use '--langversion:5.0' and '--mlcompatibility'."
 227,buildCouldNotResolveAssembly,"Could not resolve assembly '%s'"
 228,buildCouldNotResolveAssemblyRequiredByFile,"Could not resolve assembly '%s' required by '%s'"
 229,buildErrorOpeningBinaryFile,"Error opening binary file '%s': %s"
@@ -1078,13 +1080,21 @@ parsNonAtomicType,"The use of the type syntax 'int C' and 'C  <int>' is not perm
 #1203 - used for error in FSharp.Core CompilerMessage message
 #1204 - used for error in FSharp.Core CompilerMessage message
 mlCompatMessage,"This construct is for ML compatibility. %s. You can disable this warning by using '--mlcompatibility' or '--nowarn:62'."
+mlCompatError,"This construct is deprecated. %s. You can enable this feature by using '--langversion:5.0' and '--mlcompatibility'."
+mlCompatKeyword,"In previous versions of F# '%s' was a reserved keyword but the use of this keyword is now deprecated"
+mlCompatLightOffNoLongerSupported,"The use of '#light \"off\"' or '#indent \"off\"' was deprecated in F# 2.0 and is no longer supported"
+mlCompatSigColonNoLongerSupported,"The use of 'module M: sig ... end ' was deprecated in F# 2.0 and is no longer supported. Change the ':' to an '=' and remove the 'sig' and 'end' and use indentation instead"
+mlCompatSigEndNoLongerSupported,"The use of 'module M = sig ... end ' was deprecated in F# 2.0 and is no longer supported. Remove the 'sig' and 'end' and use indentation instead"
+mlCompatMultiPrefixTyparsNoLongerSupported,"The use of multiple parenthesized type parameters before a generic type name such as '(int, int) Map' was deprecated in F# 2.0 and is no longer supported"
+mlCompatStructEndNoLongerSupported,"The use of 'module M = struct ... end ' was deprecated in F# 2.0 and is no longer supported. Remove the 'struct' and 'end' and use indentation instead"
 #1205,chkDuplicateInherittedVirtualMethod,"Duplicate virtual methods. There are multiple virtual methods named '%s' with the same signature in the parent (inherited) type. This may be a result of instantiating the parent type."
 1206,ilFieldDoesNotHaveValidOffsetForStructureLayout,"The type '%s' has been marked as having an Explicit layout, but the field '%s' has not been marked with the 'FieldOffset' attribute"
 1207,tcInterfacesShouldUseInheritNotInterface,"Interfaces inherited by other interfaces should be declared using 'inherit ...' instead of 'interface ...'"
 1208,parsInvalidPrefixOperator,"Invalid prefix operator"
 1208,parsInvalidPrefixOperatorDefinition,"Invalid operator definition. Prefix operator definitions must use a valid prefix operator name."
 buildCompilingExtensionIsForML,"The file extensions '.ml' and '.mli' are for ML compatibility"
 lexIndentOffForML,"Consider using a file with extension '.ml' or '.mli' instead"
+lexIfOCaml,"IF-FSHARP/IF-CAML regions are no longer supported"
 1209,activePatternIdentIsNotFunctionTyped,"Active pattern '%s' is not a function"
 1210,activePatternChoiceHasFreeTypars,"Active pattern '%s' has a result type containing type variables that are not determined by the input. The common cause is a when a result case is not mentioned, e.g. 'let (|A|B|) (x:int) = A x'. This can be fixed with a type constraint, e.g. 'let (|A|B|) (x:int) : Choice<int,unit> = A x'"
 1211,ilFieldHasOffsetForSequentialLayout,"The FieldOffset attribute can only be placed on members of types marked with the StructLayout(LayoutKind.Explicit)"
@@ -1237,6 +1247,7 @@ featureRefCellNotationInformationals,"informational messages related to referenc
 featureDiscardUseValue,"discard pattern in use binding"
 featureNonVariablePatternsToRightOfAsPatterns,"non-variable patterns to the right of 'as' patterns"
 featureAttributesToRightOfModuleKeyword,"attributes to the right of the 'module' keyword"
+featureMLCompatRevisions,"ML compatibility revisions"
 3090,tcIfThenElseMayNotBeUsedWithinQueries,"An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead."
 3091,ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen,"Invalid argument to 'methodhandleof' during codegen"
 3092,etProvidedTypeReferenceMissingArgument,"A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies."

src/fsharp/IlxGen.fs

@@ -4580,8 +4580,9 @@ and GenDefaultValue cenv cgbuf eenv (ty, m) =
                 // "initobj" (Generated by EmitInitLocal) doesn't work on byref types
                 // But ilzero(&ty) only gets generated in the built-in get-address function so
                 // we can just rely on zeroinit of all IL locals.
-                if realloc && not (IsILTypeByref ilTy) then
+                if (realloc || not eenv.initLocals) && not (IsILTypeByref ilTy) then
                     EmitInitLocal cgbuf ilTy locIdx
+
                 EmitGetLocal cgbuf ilTy locIdx
             )
 

src/fsharp/LanguageFeatures.fs

@@ -44,9 +44,10 @@ type LanguageFeature =
     | UseBindingValueDiscard
     | NonVariablePatternsToRightOfAsPatterns
     | AttributesToRightOfModuleKeyword
+    | MLCompatRevisions
 
 /// LanguageVersion management
-type LanguageVersion (specifiedVersionAsString) =
+type LanguageVersion (versionText) =
 
     // When we increment language versions here preview is higher than current RTM version
     static let languageVersion46 = 4.6m
@@ -98,10 +99,13 @@ type LanguageVersion (specifiedVersionAsString) =
 
             // F# preview
             LanguageFeature.FromEndSlicing, previewVersion
+            LanguageFeature.MLCompatRevisions,previewVersion
         ]
 
+    static let defaultLanguageVersion = LanguageVersion("default")
+
     let specified =
-        match specifiedVersionAsString with
+        match versionText with
         | "?" -> 0m
         | "preview" -> previewVersion
         | "default" -> defaultVersion
@@ -127,7 +131,7 @@ type LanguageVersion (specifiedVersionAsString) =
 
     /// Has preview been explicitly specified
     member _.IsExplicitlySpecifiedAs50OrBefore() =
-        match specifiedVersionAsString with
+        match versionText with
         | "4.6" -> true
         | "4.7" -> true
         | "5.0" -> true
@@ -153,6 +157,9 @@ type LanguageVersion (specifiedVersionAsString) =
                 sprintf "%M%s" v (if v = defaultVersion then " (Default)" else "")
         |]
 
+    /// Get the text used to specify the version
+    member _.VersionText = versionText
+
     /// Get the specified LanguageVersion
     member _.SpecifiedVersion = specified
 
@@ -190,9 +197,19 @@ type LanguageVersion (specifiedVersionAsString) =
         | LanguageFeature.UseBindingValueDiscard -> FSComp.SR.featureDiscardUseValue()
         | LanguageFeature.NonVariablePatternsToRightOfAsPatterns -> FSComp.SR.featureNonVariablePatternsToRightOfAsPatterns()
         | LanguageFeature.AttributesToRightOfModuleKeyword -> FSComp.SR.featureAttributesToRightOfModuleKeyword()
+        | LanguageFeature.MLCompatRevisions -> FSComp.SR.featureMLCompatRevisions()
 
     /// Get a version string associated with the given feature.
     member _.GetFeatureVersionString feature =
         match features.TryGetValue feature with
         | true, v -> versionToString v
         | _ -> invalidArg "feature" "Internal error: Unable to find feature."
+
+    override x.Equals(yobj: obj) =
+        match yobj with 
+        | :? LanguageVersion as y -> x.SpecifiedVersion = y.SpecifiedVersion
+        | _ -> false
+
+    override x.GetHashCode() = hash x.SpecifiedVersion
+
+    static member Default = defaultLanguageVersion

src/fsharp/LanguageFeatures.fsi

@@ -34,6 +34,7 @@ type LanguageFeature =
     | UseBindingValueDiscard
     | NonVariablePatternsToRightOfAsPatterns
     | AttributesToRightOfModuleKeyword
+    | MLCompatRevisions
 
 /// LanguageVersion management
 type LanguageVersion =
@@ -62,6 +63,9 @@ type LanguageVersion =
     /// Get the specified LanguageVersion
     member SpecifiedVersion: decimal
 
+    /// Get the text used to specify the version, several of which may map to the same version
+    member VersionText: string
+
     /// Get the specified LanguageVersion as a string
     member SpecifiedVersionString: string
 
@@ -70,3 +74,5 @@ type LanguageVersion =
 
     /// Get a version string associated with the given feature.
     member GetFeatureVersionString: feature: LanguageFeature -> string
+
+    static member Default: LanguageVersion

src/fsharp/ParseAndCheckInputs.fs

@@ -21,6 +21,7 @@ open FSharp.Compiler.CompilerDiagnostics
 open FSharp.Compiler.CompilerImports
 open FSharp.Compiler.Diagnostics
 open FSharp.Compiler.ErrorLogger
+open FSharp.Compiler.Features
 open FSharp.Compiler.IO
 open FSharp.Compiler.Lexhelp
 open FSharp.Compiler.NameResolution
@@ -269,7 +270,10 @@ let ParseInput (lexer, errorLogger: ErrorLogger, lexbuf: UnicodeLexing.Lexbuf, d
     try
         let input =
             if mlCompatSuffixes |> List.exists (FileSystemUtils.checkSuffix lower) then
-                mlCompatWarning (FSComp.SR.buildCompilingExtensionIsForML()) rangeStartup
+                if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then
+                    errorR(Error(FSComp.SR.buildInvalidSourceFileExtensionML filename, rangeStartup))
+                else
+                    mlCompatWarning (FSComp.SR.buildCompilingExtensionIsForML()) rangeStartup
 
             // Call the appropriate parser - for signature files or implementation files
             if FSharpImplFileSuffixes |> List.exists (FileSystemUtils.checkSuffix lower) then
@@ -279,7 +283,11 @@ let ParseInput (lexer, errorLogger: ErrorLogger, lexbuf: UnicodeLexing.Lexbuf, d
                 let intfs = Parser.signatureFile lexer lexbuf
                 PostParseModuleSpecs (defaultNamespace, filename, isLastCompiland, intfs)
             else
-                delayLogger.Error(Error(FSComp.SR.buildInvalidSourceFileExtension filename, rangeStartup))
+                if lexbuf.SupportsFeature LanguageFeature.MLCompatRevisions then
+                    error(Error(FSComp.SR.buildInvalidSourceFileExtensionUpdated filename, rangeStartup))
+                else
+                    error(Error(FSComp.SR.buildInvalidSourceFileExtension filename, rangeStartup))
+
 
         scopedPragmas <- GetScopedPragmasForInput input
         input
@@ -416,8 +424,7 @@ let parseInputFileAux (tcConfig: TcConfig, lexResourceManager, conditionalCompil
     use reader = fileStream.GetReader(tcConfig.inputCodePage, retryLocked)
 
     // Set up the LexBuffer for the file
-    let checkLanguageFeatureErrorRecover = ErrorLogger.checkLanguageFeatureErrorRecover tcConfig.langVersion
-    let lexbuf = UnicodeLexing.StreamReaderAsLexbuf(not tcConfig.compilingFslib, tcConfig.langVersion.SupportsFeature, checkLanguageFeatureErrorRecover, reader)
+    let lexbuf = UnicodeLexing.StreamReaderAsLexbuf(not tcConfig.compilingFslib, tcConfig.langVersion, reader)
 
     // Parse the file drawing tokens from the lexbuf
     ParseOneInputLexbuf(tcConfig, lexResourceManager, conditionalCompilationDefines, lexbuf, filename, isLastCompiland, errorLogger)