Merge pull request #1333 from dsyme/fix-1332

Fix for 1332

Author: KevinRansom

src/fsharp/AccessibilityLogic.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/infos.fs

@@ -732,7 +732,7 @@ type ILMethInfo =
         let md = x.RawMetadata 
         not md.IsConstructor &&
         not md.IsClassInitializer &&
-        (md.Access = ILMemberAccess.Family)
+        (md.Access = ILMemberAccess.Family || md.Access = ILMemberAccess.FamilyOrAssembly)
 
     /// Indicates if the IL method is marked virtual.
     member x.IsVirtual = x.RawMetadata.IsVirtual

tests/fsharp/core/internalsvisible/librarycs.cs

@@ -15,5 +15,17 @@ internal class APrivateClass
         {
                 private  static int PrivateProperty    { get { return 2; } }
                 internal static int InternalProperty   { get { return 2; } }
-        }       
+        }
+    public class Class1
+    {
+        public Class1() { }
+        protected static int ProtectedStatic;
+        internal static int InternalStatic;
+        protected internal static int ProtectedInternalStatic;
+        public static int PublicStatic;
+        protected int Protected;
+        internal int Internal;
+        protected internal int ProtectedInternal;
+        public int Public;
+    }
 }

tests/fsharp/core/internalsvisible/main.fs

@@ -18,6 +18,24 @@ printf   "APrivateClass.InternalProperty  = %2d\n" LibraryCS.APrivateClass.Inter
 
 //printf "privateF  2 = %d\n"   (Library.M.privateF  2) // inaccessable
 
+module internal Repro1332 = 
+  let c = LibraryCS.Class1()
+  //c.Protected |> ignore
+  c.Internal |> ignore
+  c.ProtectedInternal |> ignore
+  LibraryCS.Class1.InternalStatic |> ignore
+  LibraryCS.Class1.ProtectedInternalStatic |> ignore
+
+type internal Class2() = 
+  inherit LibraryCS.Class1()
+  member c.M() = 
+      c.Internal |> ignore
+      c.ProtectedInternal |> ignore
+      c.Protected |> ignore
+      LibraryCS.Class1.InternalStatic |> ignore
+      LibraryCS.Class1.ProtectedInternalStatic |> ignore
+      LibraryCS.Class1.ProtectedStatic |> ignore
+
 
 (* Check that internalVisibleTo items can be used in internal items *)
 module internal Repro3737 =