integrate visualfsharp master --> fsharp master

Author: dsyme

src/absil/il.fs

@@ -4685,7 +4685,7 @@ type ILTypeSigParser(tstring : string) =
         let ilty = x.ParseType()
         ILAttribElem.Type(Some(ilty))
 
-let decodeILAttribData ilg (ca: ILAttribute) scope = 
+let decodeILAttribData ilg (ca: ILAttribute) = 
     let bytes = ca.Data
     let sigptr = 0
     let bb0,sigptr = sigptr_get_byte bytes sigptr
@@ -4779,15 +4779,19 @@ let decodeILAttribData ilg (ca: ILAttribute) scope =
       let et,sigptr = sigptr_get_u8 bytes sigptr
       // We have a named value 
       let ty,sigptr = 
-        // REVIEW: Post-M3, consider removing the restriction for scope - it's unnecessary
-        // because you can reconstruct scope using the qualified name from the CA Blob
-        if (0x50 = (int et) || 0x55 = (int et)) && Option.isSome scope then
+        if (0x50 = (int et) || 0x55 = (int et)) then
             let qualified_tname,sigptr = sigptr_get_serstring bytes sigptr
-            // we're already getting the qualified name from the binary blob
-            // if we don't split out the unqualified name from the qualified name,
-            // we'll write the qualified assembly reference string twice to the binary blob
-            let unqualified_tname = qualified_tname.Split([|','|]).[0]
-            let scoref = Option.get scope                    
+            let unqualified_tname, rest = 
+                let pieces = qualified_tname.Split(',')
+                if pieces.Length > 1 then 
+                    pieces.[0], Some (String.concat "," pieces.[1..])
+                else 
+                    pieces.[0], None
+            let scoref = 
+                match rest with 
+                | Some aname -> ILScopeRef.Assembly(ILAssemblyRef.FromAssemblyName(System.Reflection.AssemblyName(aname)))        
+                | None -> ilg.traits.ScopeRef
+
             let tref = mkILTyRef (scoref,unqualified_tname)
             let tspec = mkILNonGenericTySpec tref
             ILType.Value(tspec),sigptr            

src/absil/il.fsi

@@ -1797,11 +1797,9 @@ val destTypeDefsWithGlobalFunctionsFirst: ILGlobals -> ILTypeDefs -> ILTypeDef l
 /// Note: not all custom attribute data can be decoded without binding types.  In particular 
 /// enums must be bound in order to discover the size of the underlying integer. 
 /// The following assumes enums have size int32. 
-/// It also does not completely decode System.Type attributes 
 val decodeILAttribData: 
     ILGlobals -> 
     ILAttribute -> 
-    ILScopeRef option ->
       ILAttribElem list *  (* fixed args *)
       ILAttributeNamedArg list (* named args: values and flags indicating if they are fields or properties *) 
 

src/absil/ilmorph.fs

@@ -292,7 +292,7 @@ let cattr_typ2typ ilg f c =
     // dev11 M3 defensive coding: if anything goes wrong with attribute decoding or encoding, then back out.
     if morphCustomAttributeData then
         try 
-           let elems,namedArgs = IL.decodeILAttribData ilg c (Some(meth.MethodRef.EnclosingTypeRef.Scope))
+           let elems,namedArgs = IL.decodeILAttribData ilg c 
            let elems = elems |> List.map (celem_typ2typ f)
            let namedArgs = namedArgs |> List.map (cnamedarg_typ2typ f)
            IL.mkILCustomAttribMethRef ilg (meth, elems, namedArgs)       

src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj

@@ -115,6 +115,7 @@
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" Condition="'$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'net20'" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Collections\StringModule.fs" />
     <Compile Include="FSharp.Core\PrimTypes.fs" />
+    <Compile Include="FSharp.Core\ComparersRegression.fs" />
     <Compile Include="FSharp.Core\DiscrimantedUnionType.fs" /> 
     <Compile Include="FSharp.Core\Microsoft.FSharp.Core\BigIntType.fs" />
     <Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversions.fs" />