Merge pull request #498 from dsyme/integrate-78

Integrate visualfsharp/master and fsharp/master --> master

Author: dsyme

.gitignore

@@ -9,7 +9,6 @@ lib/bootstrap/4.0/policy*
 aclocal.m4
 src/*.userprefs
 src/fsharp/FSStrings.resources
-lkg
 packages
 src/fsharp/FSharp.Build/*.resx
 src/fsharp/FSharp.Build-proto/*.resx

CHANGELOG-fsharp.md

@@ -0,0 +1,73 @@
+4.0.1.1
+  * Integrate Microsoft\visualfsharp to 8111c63. See CHANGELOG-visualfsharp.md for changes from Microsoft\visualfsharp
+  * 04cd959 - fix problem with loop optimization
+  * d995c59 - Assume we are inside XBuild when 4.5/Mono.Posix.dll exists
+  * Fix [#483](https://github.com/fsharp/fsharp/issues/483) - Call to Type.GetType for a missing type causes FSI on Mono to produce an erroneous error
+
+4.0.0.4
+  * Integrate Microsoft\visualfsharp to 2d413fb94. See CHANGELOG.md for changes from Microsoft\visualfsharp
+
+4.0.0.3
+  * Fix build problems
+
+4.0.0.1
+  * Integrate F# 4.0
+
+3.1.1.25
+  * Upstream fix: implement correct version number scheme for new PCL profiles
+  
+3.1.1.20
+  * Upstream fix:: #! treated as a comment when it is at the start of an fsharp file
+  * Upstream fix visualfsharp.codeplex.com issue #78 - allow space characters in active pattern case identifiers
+  * Upstream fix visualfsharp.codeplex.com issue #78 - Adjust parser to disallow vertical pipes in active pattern case identifiers. 
+  * Upstream fix for visualfsharp.codeplex.com issue #69 - Invalid code generated when calling C# method with optional nullable args
+  * Upstream fix for visualfsharp.codeplex.com issue #9 - XML doc comments on F# record type fields do not appear when accessing in C#
+
+3.1.1.19
+  * Added files for the nuget packages
+  
+3.1.1.18
+  * Do not install FSharp.Build.dll in the GAC. It is not in the GAC on Windows.
+
+3.1.1.17
+  * Remove service components from FSharp.Compiler.dll since. All clients should now use FSharp.Compiler.Service.dll
+
+3.1.1.15
+  * Upstream 2d8ebcd43: XmlDoc generation bugfix: remove duplicate namespaces
+  * Upstream 3bd52625b: Address-of optimizations for better performance on structs
+  * Upstream c46aa237a: Perf improvement for Seq.windowed  
+  * Upstream 301a6f33: make it possible to set breakpoint inside quotation
+  * FSharp.Core for portable profiles 7, 78, 259 if reference assemblies are present (delay-signed)
+  
+3.1.1.14
+  * Change monotouch and monodroid FSharp.Core.dll to both use 2.3.98.1
+  
+3.1.1.12
+  * Add build command "all-monotouch-monodroid"
+
+3.1.1.11
+
+  * F# Interactive now uses .NET 4.5 profile
+  * Fix for performance regression in 3.1 with extension members
+  * Add query support to FSharp.Core portable profiles
+  * Fix problem with building portable libraries (https://github.com/fsharp/fsharp/issues/299)
+
+3.1.1.10
+  * Include fixes from Microsoft included with Visual F# Tools 3.1.1
+
+3.1.1.7
+  * Build back versions of FSharp.Core 2.3.0.0, 2.3.5.0, 4.3.0.0 to include code generation fix.
+  * Build Profile7 (portable47) FSharp.Core
+
+3.0.30
+  * Partial fix for allowing F# 3.1 projects to compile using xbuild (also 
+    requires xbuild fix)
+
+  * Remove a multitude of links in xbuild directories in favour of targets 
+    files which include the canonical targets
+
+3.0.29
+
+  * Proper DESTDIR support (very useful for making custom deb/rpm packages)
+
+

CHANGELOG-visualfsharp.md

@@ -74,11 +74,13 @@
     <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
   </PropertyGroup>
   <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
+<!--
   <Target Name="BeforeBuild">
     <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.sigdata')" />
     <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.optdata')" />
     <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.dll" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.dll')" />
     <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.sigdata')" />
     <Copy SourceFiles="$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" Condition="Exists('$(MSBuildExtensionsPath32)\..\lib\mono\4.5\FSharp.Core.optdata')"  />
   </Target>
+-->
 </Project>

samples/FsiExe/FsiExe.fsproj

@@ -225,9 +225,6 @@ type MemoryMappedFile(hMap: MemoryMapping.HANDLE, start:nativeint) =
 type ByteFile(bytes:byte[]) = 
     inherit BinaryFile()
 
-    static member OpenIn f = ByteFile(FileSystem.ReadAllBytesShim f)
-    static member OpenBytes bytes = ByteFile(bytes)
-
     override mc.ReadByte addr = bytes.[addr]
     override mc.ReadBytes addr len = Array.sub bytes addr len
     override m.CountUtf8String addr = 
@@ -910,6 +907,8 @@ type ILModuleReader =
       dispose: unit -> unit }
     member x.ILModuleDef = x.modul
     member x.ILAssemblyRefs = x.ilAssemblyRefs.Force()
+    interface IDisposable with
+        member x.Dispose() = x.dispose()
 
 
 type MethodData = MethodData of ILType * ILCallingConv * string * ILTypes * ILType * ILTypes
@@ -3954,8 +3953,6 @@ let rec genOpenBinaryReader infile is opts =
 
     ilModule,ilAssemblyRefs,pdb
 
-let CloseILModuleReader x = x.dispose()
-
 let mkDefault ilg = 
     { optimizeForMemory=false; 
       pdbPath= None; 
@@ -3980,7 +3977,7 @@ let OpenILModuleReader infile opts =
             mmap.Close();
             ClosePdbReader pdb) }
     else
-        let mc = ByteFile.OpenIn infile
+        let mc = ByteFile(infile |> FileSystem.ReadAllBytesShim)
         let modul,ilAssemblyRefs,pdb = genOpenBinaryReader infile mc opts
         { modul = modul; 
           ilAssemblyRefs = ilAssemblyRefs;
@@ -4006,7 +4003,7 @@ let OpenILModuleReaderAfterReadingAllBytes infile opts =
     match cacheResult with 
     | Some(ilModuleReader) -> ilModuleReader
     | None -> 
-        let mc = ByteFile.OpenIn infile
+        let mc = ByteFile(infile |> FileSystem.ReadAllBytesShim)
         let modul,ilAssemblyRefs,pdb = genOpenBinaryReader infile mc opts
         let ilModuleReader = 
             { modul = modul; 
@@ -4018,7 +4015,7 @@ let OpenILModuleReaderAfterReadingAllBytes infile opts =
 
 let OpenILModuleReaderFromBytes fileNameForDebugOutput bytes opts = 
         assert opts.pdbPath.IsNone
-        let mc = ByteFile.OpenBytes bytes
+        let mc = ByteFile(bytes)
         let modul,ilAssemblyRefs,pdb = genOpenBinaryReader fileNameForDebugOutput mc opts
         let ilModuleReader = 
             { modul = modul; 

src/absil/ilread.fs

@@ -41,16 +41,16 @@ type ILReaderOptions =
 val mkDefault :  ILGlobals -> ILReaderOptions
 
 // The non-memory resources (i.e. the file handle) associated with 
-// the read can be recovered by calling CloseILModuleReader.  Any remaining 
+// the read can be recovered by calling Dispose.  Any remaining 
 // lazily-computed items in the metadata graph returned by MetadataOfILModuleReader 
 // will no longer be valid. 
 [<Sealed>]
 type ILModuleReader =
     member ILModuleDef : ILModuleDef
     member ILAssemblyRefs : ILAssemblyRef list
+    interface System.IDisposable
 
 val OpenILModuleReader: string -> ILReaderOptions -> ILModuleReader
-val CloseILModuleReader: ILModuleReader -> unit
 
 /// Open a binary reader, except first copy the entire contents of the binary into 
 /// memory, close the file and ensure any subsequent reads happen from the in-memory store. 

src/absil/ilread.fsi

@@ -2381,11 +2381,8 @@ type AssemblyResolution =
                 | Some aref -> aref
                 | None -> 
                     let readerSettings : ILBinaryReader.ILReaderOptions = {pdbPath=None;ilGlobals = EcmaILGlobals;optimizeForMemory=false} // ??
-                    let reader = ILBinaryReader.OpenILModuleReaderAfterReadingAllBytes this.resolvedPath readerSettings
-                    try
-                        mkRefToILAssembly reader.ILModuleDef.ManifestOfAssembly
-                    finally 
-                        ILBinaryReader.CloseILModuleReader reader
+                    use reader = ILBinaryReader.OpenILModuleReaderAfterReadingAllBytes this.resolvedPath readerSettings
+                    mkRefToILAssembly reader.ILModuleDef.ManifestOfAssembly
             this.ilAssemblyRef := Some(assRef)
             assRef
 
@@ -2469,21 +2466,17 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
             let filename = ComputeMakePathAbsolute data.implicitIncludeDir primaryAssemblyFilename
             try 
 
-                let ilReader = OpenILBinary(filename,data.optimizeForMemory,data.openBinariesInMemory,None,None, data.primaryAssembly.Name, data.noDebugData, data.shadowCopyReferences)
-                try 
-                   let ilModule = ilReader.ILModuleDef
+                use ilReader = OpenILBinary(filename,data.optimizeForMemory,data.openBinariesInMemory,None,None, data.primaryAssembly.Name, data.noDebugData, data.shadowCopyReferences)
+                let ilModule = ilReader.ILModuleDef
 
-                   match ilModule.ManifestOfAssembly.Version with 
-                   | Some(v1,v2,v3,_) -> 
-                       if v1 = 1us then 
-                           warning(Error(FSComp.SR.buildRequiresCLI2(filename),rangeStartup))
-                       let clrRoot = Some(Path.GetDirectoryName(FileSystem.GetFullPathShim(filename)))
-
-                       clrRoot, (int v1, sprintf "v%d.%d" v1 v2), (v1=5us && v2=0us && v3=5us) // SL5 mscorlib is 5.0.5.0
-                   | _ -> 
-                       failwith (FSComp.SR.buildCouldNotReadVersionInfoFromMscorlib())
-                finally
-                   ILBinaryReader.CloseILModuleReader ilReader
+                match ilModule.ManifestOfAssembly.Version with 
+                | Some(v1,v2,v3,_) -> 
+                    if v1 = 1us then 
+                        warning(Error(FSComp.SR.buildRequiresCLI2(filename),rangeStartup))
+                    let clrRoot = Some(Path.GetDirectoryName(FileSystem.GetFullPathShim(filename)))
+                    clrRoot, (int v1, sprintf "v%d.%d" v1 v2), (v1=5us && v2=0us && v3=5us) // SL5 mscorlib is 5.0.5.0
+                | _ -> 
+                    failwith (FSComp.SR.buildCouldNotReadVersionInfoFromMscorlib())
             with _ -> 
                 error(Error(FSComp.SR.buildCannotReadAssembly(filename),rangeStartup))
         | _ ->
@@ -2531,13 +2524,10 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
         | Some(fslibFilename) ->
             let filename = ComputeMakePathAbsolute data.implicitIncludeDir fslibFilename
             try 
-                let ilReader = OpenILBinary(filename,data.optimizeForMemory,data.openBinariesInMemory,None,None, data.primaryAssembly.Name, data.noDebugData, data.shadowCopyReferences)
-                try 
-                   checkFSharpBinaryCompatWithMscorlib filename ilReader.ILAssemblyRefs ilReader.ILModuleDef.ManifestOfAssembly.Version rangeStartup;
-                   let fslibRoot = Path.GetDirectoryName(FileSystem.GetFullPathShim(filename))
-                   fslibRoot (* , sprintf "v%d.%d" v1 v2 *)
-                finally
-                   ILBinaryReader.CloseILModuleReader ilReader
+                use ilReader = OpenILBinary(filename,data.optimizeForMemory,data.openBinariesInMemory,None,None, data.primaryAssembly.Name, data.noDebugData, data.shadowCopyReferences)
+                checkFSharpBinaryCompatWithMscorlib filename ilReader.ILAssemblyRefs ilReader.ILModuleDef.ManifestOfAssembly.Version rangeStartup;
+                let fslibRoot = Path.GetDirectoryName(FileSystem.GetFullPathShim(filename))
+                fslibRoot (* , sprintf "v%d.%d" v1 v2 *)
             with _ -> 
                 error(Error(FSComp.SR.buildCannotReadAssembly(filename),rangeStartup))
         | _ ->
@@ -2806,12 +2796,9 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
                     else 
                         try
                             let readerSettings : ILBinaryReader.ILReaderOptions = {pdbPath=None;ilGlobals = EcmaILGlobals;optimizeForMemory=false}
-                            let reader = ILBinaryReader.OpenILModuleReaderAfterReadingAllBytes resolved readerSettings
-                            try
-                                let assRef = mkRefToILAssembly reader.ILModuleDef.ManifestOfAssembly
-                                assRef.QualifiedName
-                            finally 
-                                ILBinaryReader.CloseILModuleReader reader
+                            use reader = ILBinaryReader.OpenILModuleReaderAfterReadingAllBytes resolved readerSettings
+                            let assRef = mkRefToILAssembly reader.ILModuleDef.ManifestOfAssembly
+                            assRef.QualifiedName
                         with e ->
                             ""
                 Some
@@ -3851,7 +3838,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
 
         let ilILBinaryReader = OpenILBinary(filename,tcConfig.optimizeForMemory,tcConfig.openBinariesInMemory,ilGlobalsOpt,pdbPathOption, tcConfig.primaryAssembly.Name, tcConfig.noDebugData, tcConfig.shadowCopyReferences)
 
-        tcImports.AttachDisposeAction(fun _ -> ILBinaryReader.CloseILModuleReader ilILBinaryReader)
+        tcImports.AttachDisposeAction(fun _ -> (ilILBinaryReader :> IDisposable).Dispose())
         ilILBinaryReader.ILModuleDef, ilILBinaryReader.ILAssemblyRefs
       with e ->
         error(Error(FSComp.SR.buildErrorOpeningBinaryFile(filename, e.Message),m))

src/fsharp/CompileOps.fs

@@ -7765,9 +7765,9 @@ let (|CompiledForEachExpr|_|) g expr =
                  when valRefEq g (mkLocalValRef enumerableVar) enumerableVar2 &&
                       enumerableVar.IsCompilerGenerated &&
                       enumeratorVar.IsCompilerGenerated &&
-                      let fvs = (freeInExpr CollectLocals bodyExpr)
-                      not (Zset.contains enumerableVar fvs.FreeLocals) && 
-                      not (Zset.contains enumeratorVar fvs.FreeLocals) ->
+                      (let fvs = (freeInExpr CollectLocals bodyExpr)
+                       not (Zset.contains enumerableVar fvs.FreeLocals) && 
+                       not (Zset.contains enumeratorVar fvs.FreeLocals)) ->
 
         // Extract useful ranges
         let m = enumerableExpr.Range
@@ -7788,7 +7788,6 @@ let (|CompiledInt32RangeForEachExpr|_|) g expr =
         | _ -> None
     | _ -> None
 
-
 type OptimizeForExpressionOptions = OptimizeIntRangesOnly | OptimizeAllForExpressions
 
 let DetectAndOptimizeForExpression g option expr =

src/fsharp/TastOps.fs

@@ -35,12 +35,12 @@ open Microsoft.FSharp.Core.CompilerServices
 /// Unique name generator for stamps attached to lambdas and object expressions
 type Unique = int64
 //++GLOBAL MUTABLE STATE
-let newUnique = let i = ref 0L in fun () -> i := !i + 1L; !i
+let newUnique = let i = ref 0L in fun () -> System.Threading.Interlocked.Increment(i)
 type Stamp = int64
 
 /// Unique name generator for stamps attached to to val_specs, tycon_specs etc.
 //++GLOBAL MUTABLE STATE
-let newStamp = let i = ref 0L in fun () -> i := !i + 1L; !i
+let newStamp = let i = ref 0L in fun () -> System.Threading.Interlocked.Increment(i)
 
 /// A global generator of compiler generated names
 // ++GLOBAL MUTABLE STATE