Merge branch 'master' of https://github.com/Microsoft/visualfsharp into roslyn

Author: Omar Tawfik

DEVGUIDE.md

@@ -50,6 +50,10 @@ There are various qualifiers:
     build.cmd test-fsharpqa   -- build, run tests\fsharpqa suite
     build.cmd test-vs         -- build, run Visual F# IDE Tools unit tests
 
+**Notes**
+To build and test Visual F# IDE Tools, you must use [Visual Studio "vNext" (aka "Dev15")](https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx). This is the one after Visual Studio 2015 (aka "Dev 14").  You must also install Visual Studio SDK (also called _Visual Studio Extensibility SDK_ on the Visual Studio installer) before building Visual F# IDE Tools.
+Please ensure that the Visual Studio SDK version is matched with your current Visual Studio to ensure successful builds. For example: Visual Studio 2015 Update 1 requires Visual Studio 2015 SDK Update 1. Any installation of Visual Studio 2015 and later provides Visual Studio SDK as part of the installation of Visual Studio 2015 as feature installation. 
+
 Combinations are also allowed:
 
     build.cmd debug,compiler,notests   -- build the debug compiler and run smoke tests
@@ -147,8 +151,13 @@ For **Release** this corresponds to these steps, which you can run individually
 
 ### 4. [Optional] Install the Visual F# IDE Tools 
 
-**Note:** This step will install a VSIX extension into Visual Studio 15 that changes the Visual F# IDE Tools 
-components installed into Visual Studio 15.  You can revert this step by disabling or uninstalling the addin.
+At time of writing, the Visual F# IDE Tools can only be installed into Visual Studio "Next" (aka "Dev15") releases.
+The new builds of the Visual F# IDE Tools can no longer be installed into Visual Studio 2015.
+
+You can install VIsual Studio "Next (aka "Dev15") from https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx.
+
+**Note:** This step will install a VSIX extension into Visual Studio "Next" (aka "Dev15") that changes the Visual F# IDE Tools 
+components installed in that VS installation.  You can revert this step by disabling or uninstalling the addin.
 
 For **Debug**:
 

VisualFSharp.sln

@@ -128,9 +128,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2015
-
+ 
 environment:
   matrix:
     - BUILD_PROFILE: ci_part1

build.cmd

@@ -141,7 +141,8 @@ if /i '%ARG%' == 'ci' (
     set CONF_FSHARPQA_SUITE=Smoke
 )
 
-REM These divide 'ci' into three chunks which can be done in parallel
+
+REM These divide 'ci' into two chunks which can be done in parallel
 if /i '%ARG%' == 'ci_part1' (
     set BUILD_PROTO=1
     set SKIP_EXPENSIVE_TESTS=1

src/absil/ildiag.fs

@@ -7,6 +7,9 @@ module internal Microsoft.FSharp.Compiler.AbstractIL.Diagnostics
 open Internal.Utilities
 
 let diagnosticsLog = ref (Some stdout)
+
+let setDiagnosticsChannel s = diagnosticsLog := s 
+
 let dflushn () = match !diagnosticsLog with None -> () | Some d -> d.WriteLine(); d.Flush()
 let dflush () = match !diagnosticsLog with None -> () | Some d -> d.Flush()
 let dprintn (s:string) = 
@@ -18,4 +21,3 @@ let dprintf (fmt: Format<_,_,_,_>) =
 let dprintfn (fmt: Format<_,_,_,_>) = 
     Printf.kfprintf dflushn (match !diagnosticsLog with None -> System.IO.TextWriter.Null | Some d -> d) fmt
 
-let setDiagnosticsChannel s = diagnosticsLog := s

src/absil/ildiag.fsi

@@ -11,9 +11,8 @@ module internal Microsoft.FSharp.Compiler.AbstractIL.Diagnostics
 open System.IO
 open Microsoft.FSharp.Core.Printf
 
-val public setDiagnosticsChannel: TextWriter option -> unit
+val public setDiagnosticsChannel: TextWriter option -> unit 
 
 val public dprintfn: TextWriterFormat<'a> -> 'a 
 val public dprintf: TextWriterFormat<'a> -> 'a 
-
 val public dprintn: string -> unit

src/absil/ilread.fs

@@ -1476,10 +1476,10 @@ let CollectErrorOrWarning (implicitIncludeDir,showFullPaths,flattenErrors,errorS
 
     match err.Exception with 
     | ReportedError _ -> 
-        dprintf "Unexpected ReportedError"  (* this should actually never happen *)
+        assert ("" = "Unexpected ReportedError") //  this should never happen 
         Seq.empty
     | StopProcessing -> 
-        dprintf "Unexpected StopProcessing"  (* this should actually never happen *)
+        assert ("" = "Unexpected StopProcessing") // this should never happen 
         Seq.empty
     | _ -> 
         let errors = ResizeArray()
@@ -2962,6 +2962,7 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
             let logmessage showMessages  = 
                 if showMessages && tcConfig.showReferenceResolutions then (fun (message:string)->dprintf "%s\n" message)
                 else ignore
+
             let logwarning showMessages = 
                 (fun code message->
                     if showMessages && mode = ReportErrors then 
@@ -2975,6 +2976,7 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
                         | _ -> 
                             (if code = "MSB3245" then errorR else warning)
                                 (MSBuildReferenceResolutionWarning(code,message,errorAndWarningRange)))
+
             let logerror showMessages = 
                 (fun code message ->
                     if showMessages && mode = ReportErrors then 
@@ -2988,10 +2990,12 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
                     | Some(X86) -> "x86"
                     | Some(AMD64) -> "amd64"
                     | Some(IA64) -> "ia64"
+
             let outputDirectory = 
                 match tcConfig.outputFile with 
                 | Some(outputFile) -> tcConfig.MakePathAbsolute outputFile
                 | None -> tcConfig.implicitIncludeDir
+
             let targetFrameworkDirectories =
                 match tcConfig.clrRoot with
                 | Some(clrRoot) -> [tcConfig.MakePathAbsolute clrRoot]
@@ -3033,6 +3037,7 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
                              |> Array.map(fun i->(p13 groupedReferences.[i]),(p23 groupedReferences.[i]),i) 
                              |> Array.filter (fun (_,i0,_)->resolvedAsFile|>Array.exists(fun (i1,_) -> i0=i1)|>not)
                              |> Array.map(fun (ref,_,i)->ref,string i)
+
             let resolutions = Resolve(toMsBuild,(*showMessages*)true)  
 
             // Map back to original assembly resolutions.

src/fsharp/CompileOps.fs

@@ -160,44 +160,45 @@ type TcValF = (ValRef -> ValUseFlag -> TType list -> range -> Expr * TType)
 
 type ConstraintSolverState = 
     { 
-      g: TcGlobals;
-      amap: Import.ImportMap; 
-      InfoReader : InfoReader;
+      g: TcGlobals
+      amap: Import.ImportMap 
+      InfoReader : InfoReader
       TcVal : TcValF
       /// This table stores all unsolved, ungeneralized trait constraints, indexed by free type variable.
       /// That is, there will be one entry in this table for each free type variable in 
       /// each outstanding, unsolved, ungeneralized trait constraint. Constraints are removed from the table and resolved 
       /// each time a solution to an index variable is found. 
-      mutable ExtraCxs:  HashMultiMap<Stamp, (TraitConstraintInfo * range)>;
+      mutable ExtraCxs:  HashMultiMap<Stamp, (TraitConstraintInfo * range)>
     }
 
     static member New(g,amap,infoReader, tcVal) = 
-          { g=g; amap=amap; 
+          { g=g 
+            amap=amap 
             ExtraCxs= HashMultiMap(10, HashIdentity.Structural)
             InfoReader=infoReader
-            TcVal = tcVal } ;
+            TcVal = tcVal } 
 
 
 type ConstraintSolverEnv = 
     { 
-      SolverState: ConstraintSolverState;
+      SolverState: ConstraintSolverState
       eContextInfo: ContextInfo
       MatchingOnly : bool
-      m: range;
-      EquivEnv: TypeEquivEnv;
+      m: range
+      EquivEnv: TypeEquivEnv
       DisplayEnv : DisplayEnv
     }
     member csenv.InfoReader = csenv.SolverState.InfoReader
     member csenv.g = csenv.SolverState.g
     member csenv.amap = csenv.SolverState.amap
 
 let MakeConstraintSolverEnv contextInfo css m denv = 
-    { SolverState=css;
-      m=m;
+    { SolverState=css
+      m=m
       eContextInfo = contextInfo
       // Indicates that when unifiying ty1 = ty2, only type variables in ty1 may be solved 
-      MatchingOnly=false;
-      EquivEnv=TypeEquivEnv.Empty; 
+      MatchingOnly=false
+      EquivEnv=TypeEquivEnv.Empty 
       DisplayEnv = denv }
 
 
@@ -303,9 +304,10 @@ let BakedInTraitConstraintNames =
 // Run the constraint solver with undo (used during method overload resolution)
 
 type Trace = 
-    | Trace of (unit -> unit) list ref
-    static member New () =  Trace (ref [])
-    member t.Undo () = let (Trace trace) = t in List.iter (fun a -> a ()) !trace
+    { mutable actions: (unit -> unit) list  }
+    static member New () =  { actions = [] }
+    member t.Undo () = List.iter (fun a -> a ()) t.actions
+    member t.Push f = t.actions <- f :: t.actions
 
 type OptionalTrace = 
     | NoTrace
@@ -417,7 +419,7 @@ let rec TransactStaticReq (csenv:ConstraintSolverEnv) trace (tpr:Typar) req =
         let orig = tpr.StaticReq
         match trace with 
         | NoTrace -> () 
-        | WithTrace (Trace actions) -> actions := (fun () -> tpr.SetStaticReq orig) :: !actions
+        | WithTrace trace -> trace.Push (fun () -> tpr.SetStaticReq orig) 
         tpr.SetStaticReq req;
         CompleteD
 
@@ -446,7 +448,7 @@ let rec TransactDynamicReq trace (tpr:Typar) req =
     let orig = tpr.DynamicReq
     match trace with 
     | NoTrace -> () 
-    | WithTrace (Trace actions) -> actions := (fun () -> tpr.SetDynamicReq orig) :: !actions
+    | WithTrace trace -> trace.Push (fun () -> tpr.SetDynamicReq orig) 
     tpr.SetDynamicReq req;
     CompleteD
 
@@ -673,7 +675,7 @@ let rec SolveTyparEqualsTyp (csenv:ConstraintSolverEnv) ndeep m2 trace ty1 ty =
       let tpdata = r.Data
       match trace with 
       | NoTrace -> () 
-      | WithTrace (Trace actions) -> actions := (fun () -> tpdata.typar_solution <- None) :: !actions
+      | WithTrace trace -> trace.Push (fun () -> tpdata.typar_solution <- None) 
       tpdata.typar_solution <- Some ty;
 
   (*   dprintf "setting typar %d to type %s at %a\n" r.Stamp ((DebugPrint.showType ty)) outputRange m; *)
@@ -1343,7 +1345,7 @@ and TransactMemberConstraintSolution traitInfo trace sln  =
     traitInfo.Solution <- Some sln
     match trace with 
     | NoTrace -> () 
-    | WithTrace (Trace actions) -> actions := (fun () -> traitInfo.Solution <- prev) :: !actions
+    | WithTrace trace -> trace.Push (fun () -> traitInfo.Solution <- prev) 
 
 /// Only consider overload resolution if canonicalizing or all the types are now nominal. 
 /// That is, don't perform resolution if more nominal information may influence the set of available overloads 
@@ -1410,7 +1412,7 @@ and SolveRelevantMemberConstraintsForTypar (csenv:ConstraintSolverEnv) ndeep per
 
     match trace with 
     | NoTrace -> () 
-    | WithTrace (Trace actions) -> actions := (fun () -> cxs |> List.iter (fun cx -> cxst.Add(tpn,cx))) :: !actions
+    | WithTrace trace -> trace.Push (fun () -> cxs |> List.iter (fun cx -> cxst.Add(tpn,cx))) 
 
     cxs |> AtLeastOneD (fun (traitInfo,m2) -> 
         let csenv = { csenv with m = m2 }
@@ -1437,7 +1439,7 @@ and AddMemberConstraint (csenv:ConstraintSolverEnv) ndeep m2 trace traitInfo sup
         if not (cxs |> List.exists (fun (traitInfo2,_) -> traitsAEquiv g aenv traitInfo traitInfo2)) then 
             match trace with 
             | NoTrace -> () 
-            | WithTrace (Trace actions) -> actions := (fun () -> csenv.SolverState.ExtraCxs.Remove tpn) :: !actions
+            | WithTrace trace -> trace.Push (fun () -> csenv.SolverState.ExtraCxs.Remove tpn) 
             csenv.SolverState.ExtraCxs.Add (tpn,(traitInfo,m2))
     );
 
@@ -1613,7 +1615,7 @@ and AddConstraint (csenv:ConstraintSolverEnv) ndeep m2 trace tp newConstraint  =
         let orig = d.typar_constraints
         begin match trace with 
         | NoTrace -> () 
-        | WithTrace (Trace actions) -> actions := (fun () -> d.typar_constraints <- orig) :: !actions
+        | WithTrace trace -> trace.Push (fun () -> d.typar_constraints <- orig) 
         end;
         d.typar_constraints <- newConstraints;
 
@@ -1922,11 +1924,6 @@ and CanMemberSigsMatchUpToCheck
 //------------------------------------------------------------------------- 
 
 
-and private DefinitelyEquiv (csenv:ConstraintSolverEnv) isConstraint calledArg (CallerArg(callerArgTy,m,_,_) as callerArg) = 
-    let calledArgTy = AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
-    if not (typeEquiv csenv.g calledArgTy callerArgTy) then ErrorD(Error(FSComp.SR.csArgumentTypesDoNotMatch(),m)) else
-    CompleteD
-  
 // Assert a subtype constraint, and wrap an ErrorsFromAddingSubsumptionConstraint error around any failure 
 // to allow us to report the outer types involved in the constraint 
 and private SolveTypSubsumesTypWithReport (csenv:ConstraintSolverEnv) ndeep m trace ty1 ty2 =
@@ -2409,7 +2406,7 @@ let EliminateConstraintsForGeneralizedTypars csenv trace (generalizedTypars: Typ
             cxst.Remove tpn;
             match trace with 
             | NoTrace -> () 
-            | WithTrace (Trace actions) -> actions := (fun () -> (csenv.SolverState.ExtraCxs.Add (tpn,cx))) :: !actions)
+            | WithTrace trace -> trace.Push (fun () -> (csenv.SolverState.ExtraCxs.Add (tpn,cx))))
     )
 
 

src/fsharp/ConstraintSolver.fs

@@ -98,7 +98,8 @@ val BakedInTraitConstraintNames : string list
 
 val MakeConstraintSolverEnv : ContextInfo -> ConstraintSolverState -> range -> DisplayEnv -> ConstraintSolverEnv
 
-type Trace = Trace of (unit -> unit) list ref
+[<Sealed; NoEquality; NoComparison>]
+type Trace 
 
 type OptionalTrace =
   | NoTrace