Merge pull request #609 from dsyme/integrate-82

Integrate visualfsharp master

Author: dsyme

.travis.yml

@@ -15,7 +15,12 @@ install:
 script: 
   - ./build.sh NuGet
 
+# See bug "https://bugzilla.xamarin.com/show_bug.cgi?id=41914"
+# peverify failing on Mono latest with "condition `res != EINVAL' not met", on OSX
+
 matrix:
   allow_failures:
     - os: osx
       mono: latest
+
+

RELEASE_NOTES.md

@@ -1,3 +1,9 @@
+#### 6.0.0
+  * Switch to new major version on assumption integrated F# compiler changes induce API change
+
+#### 5.0.2
+  * Integrate Microsoft\visualfsharp to 688c26bdbbfc766326fc45e4d918f87fcba1e7ba. F# 4.1 work
+
 #### 5.0.1
 * [Fixed dependencies in nuget package](https://github.com/fsharp/FSharp.Compiler.Service/pull/608)
 

appveyor.yml

@@ -8,6 +8,10 @@ environment:
     - BUILD_TARGET: DotnetCliTests
     - BUILD_TARGET: NuGet
 
+matrix:
+  allow_failures:
+    - BUILD_TARGET: DotnetCliTests
+    
 build_script:
   - ps: dotnet --info
   - cmd: build.cmd %BUILD_TARGET%

samples/FscExe/FscMain.fs

@@ -87,12 +87,8 @@ module FSharpResidentCompiler =
                               for error in errors do eprintfn "%s" (error.ToString())
                               if !progress then printfn "server: finished compilation request, argv = %A" argv
                               let output = outputCollector.GetTextAndClear()
-                              if !progress then printfn "ouput: %A" output
-                              if !progress then printfn "sending reply..." 
                               reply.Reply(output, exitCode)
-                              if !progress then printfn "collecting..." 
                               GC.Collect(3)
-                              if !progress then printfn "considering exit..." 
                               // Exit the server if there are no outstanding requests and the 
                               // current memory usage after collection is over 200MB
                               if inbox.CurrentQueueLength = 0 && GC.GetTotalMemory(true) > 200L * 1024L * 1024L then 

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

@@ -70,21 +70,28 @@ let private IsILMemberAccessible g amap m (tcrefOfViewedItem : TyconRef) ad acce
     match ad with 
     | AccessibleFromEverywhere -> 
             access = ILMemberAccess.Public
+
     | AccessibleFromSomeFSharpCode -> 
            (access = ILMemberAccess.Public || 
             access = ILMemberAccess.Family  || 
             access = ILMemberAccess.FamilyOrAssembly) 
+
     | AccessibleFrom (cpaths,tcrefViewedFromOption) ->
+
             let accessibleByFamily =
               ((access = ILMemberAccess.Family  || 
                 access = ILMemberAccess.FamilyOrAssembly) &&
                 match tcrefViewedFromOption with 
                 | None -> false
                 | Some tcrefViewedFrom ->
                     ExistsHeadTypeInEntireHierarchy  g amap m (generalizedTyconRef tcrefViewedFrom) tcrefOfViewedItem)     
+
             let accessibleByInternalsVisibleTo = 
-                (access = ILMemberAccess.Assembly && canAccessFromOneOf cpaths tcrefOfViewedItem.CompilationPath)
+                (access = ILMemberAccess.Assembly || access = ILMemberAccess.FamilyOrAssembly) && 
+                canAccessFromOneOf cpaths tcrefOfViewedItem.CompilationPath
+
             (access = ILMemberAccess.Public) || accessibleByFamily || accessibleByInternalsVisibleTo
+
     | AccessibleFromSomewhere -> 
             true
 

src/fsharp/AccessibilityLogic.fs

@@ -850,24 +850,24 @@ let TyconIsCandidateForAugmentationWithHash g tycon = TyconIsCandidateForAugment
 //------------------------------------------------------------------------- 
 
 let slotImplMethod (final,c,slotsig) : ValMemberInfo = 
-  { ImplementedSlotSigs=[slotsig];
+  { ImplementedSlotSigs=[slotsig]
     MemberFlags=
-        { IsInstance=true; 
-          IsDispatchSlot=false;
-          IsFinal=final;
-          IsOverrideOrExplicitImpl=true;
-          MemberKind=MemberKind.Member};
-    IsImplemented=false;
+        { IsInstance=true 
+          IsDispatchSlot=false
+          IsFinal=final
+          IsOverrideOrExplicitImpl=true
+          MemberKind=MemberKind.Member}
+    IsImplemented=false
     ApparentParent=c} 
 
 let nonVirtualMethod c : ValMemberInfo = 
-  { ImplementedSlotSigs=[];
-    MemberFlags={ IsInstance=true; 
-                  IsDispatchSlot=false;
-                  IsFinal=false;
-                  IsOverrideOrExplicitImpl=false;
-                  MemberKind=MemberKind.Member};
-    IsImplemented=false;
+  { ImplementedSlotSigs=[]
+    MemberFlags={ IsInstance=true 
+                  IsDispatchSlot=false
+                  IsFinal=false
+                  IsOverrideOrExplicitImpl=false
+                  MemberKind=MemberKind.Member}
+    IsImplemented=false
     ApparentParent=c} 
 
 let unitArg = ValReprInfo.unitArgData
@@ -945,7 +945,7 @@ let MakeBindingsForCompareAugmentation g (tycon:Tycon) =
               let thisv,thatv,comparee = comparef g tcref tycon 
               mkLambdas m tps [thisv;thatv] (comparee,g.int_ty)  
             [ // This one must come first because it may be inlined into the second
-              mkCompGenBind vspec2 rhs2;
+              mkCompGenBind vspec2 rhs2
               mkCompGenBind vspec1 rhs1; ] 
     if tycon.IsUnionTycon then mkCompare mkUnionCompare 
     elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkCompare mkRecdCompare 
@@ -1016,8 +1016,8 @@ let MakeBindingsForEqualityWithComparerAugmentation g (tycon:Tycon) =
 
                 mkLambdas m tps [thisv; unitv] (hashe,g.int_ty)  
 
-            [(mkCompGenBind withcGetHashCodeVal.Deref withcGetHashCodeExpr) ; 
-             (mkCompGenBind objGetHashCodeVal.Deref objGetHashCodeExpr) ; 
+            [(mkCompGenBind withcGetHashCodeVal.Deref withcGetHashCodeExpr)  
+             (mkCompGenBind objGetHashCodeVal.Deref objGetHashCodeExpr)  
              (mkCompGenBind withcEqualsVal.Deref withcEqualsExpr)] 
     if tycon.IsUnionTycon then mkStructuralEquatable mkUnionHashWithComparer mkUnionEqualityWithComparer
     elif (tycon.IsRecordTycon || tycon.IsStructOrEnumTycon) then mkStructuralEquatable mkRecdHashWithComparer mkRecdEqualityWithComparer
@@ -1054,8 +1054,8 @@ let MakeBindingsForEqualsAugmentation g (tycon:Tycon) =
             mkLambdas m tps [thisv;thatobjv] (equalse,g.bool_ty)  
 
 
-          [ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr;
-            mkCompGenBind objEqualsVal.Deref objEqualsExpr;   ] 
+          [ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr
+            mkCompGenBind objEqualsVal.Deref objEqualsExpr   ] 
     if tycon.IsExceptionDecl then mkEquals mkExnEquality 
     elif tycon.IsUnionTycon then mkEquals mkUnionEquality 
     elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkEquals mkRecdEquality