Merge pull request #406 from dsyme/integrate-14

Integrate visualfsharp/master --> master

Author: dsyme

src/absil/il.fs

@@ -4691,7 +4691,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
@@ -4785,15 +4785,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

@@ -1802,11 +1802,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/IlxGen.fs

@@ -5595,7 +5595,7 @@ and CreatePermissionSets g amap eenv (securityAttributes : Attrib list) =
         let tref = tcref.CompiledRepresentationForNamedType
         let ilattr = GenAttr amap g eenv attr
         let _, ilNamedArgs = 
-            match TryDecodeILAttribute g tref (Some(tref.Scope)) (mkILCustomAttrs [ilattr]) with
+            match TryDecodeILAttribute g tref (mkILCustomAttrs [ilattr]) with
             | Some(ae,na) -> ae, na
             | _ -> [],[]
         let setArgs = ilNamedArgs |> List.map (fun (n,ilt,_,ilae) -> (n,ilt,ilae))

src/fsharp/TastOps.fs

@@ -2522,8 +2522,8 @@ let isILAttrib (tref:ILTypeRef) (attr: ILAttribute) =
 // results of attribute lookups in the TAST
 let HasILAttribute tref (attrs: ILAttributes) = List.exists (isILAttrib tref) attrs.AsList
 
-let TryDecodeILAttribute g tref scope (attrs: ILAttributes) = 
-    attrs.AsList |> List.tryPick(fun x -> if isILAttrib tref x then Some(decodeILAttribData g.ilg x scope)  else None)
+let TryDecodeILAttribute g tref (attrs: ILAttributes) = 
+    attrs.AsList |> List.tryPick(fun x -> if isILAttrib tref x then Some(decodeILAttribData g.ilg x)  else None)
 
 // This one is done by name to ensure the compiler doesn't take a dependency on dereferencing a type that only exists in .NET 3.5
 let ILThingHasExtensionAttribute (attrs : ILAttributes) = 
@@ -2590,7 +2590,7 @@ let TryBindTyconRefAttribute g (m:range) (AttribInfo (atref,_) as args) (tcref:T
         | None -> None
 #endif
     | ILTypeMetadata (_,tdef) -> 
-        match TryDecodeILAttribute g atref (Some(atref.Scope)) tdef.CustomAttrs with 
+        match TryDecodeILAttribute g atref tdef.CustomAttrs with 
         | Some attr -> f1 attr
         | _ -> None
     | FSharpOrArrayOrByrefOrTupleOrExnTypeMetadata -> 
@@ -6111,8 +6111,7 @@ let isTypeProviderAssemblyAttr (cattr:ILAttribute) =
 
 let TryDecodeTypeProviderAssemblyAttr ilg (cattr:ILAttribute) = 
     if isTypeProviderAssemblyAttr cattr then 
-        // ok to use ecmaILGlobals here since we're querying metadata, not making it 
-        let parms, _args = decodeILAttribData ilg cattr None 
+        let parms, _args = decodeILAttribData ilg cattr 
         match parms with // The first parameter to the attribute is the name of the assembly with the compiler extensions.
         | (ILAttribElem.String (Some assemblyName))::_ -> Some assemblyName
         | (ILAttribElem.String None)::_ -> Some null
@@ -6144,8 +6143,7 @@ let tref_AutoOpenAttr () = mkILTyRef(IlxSettings.ilxFsharpCoreLibScopeRef (), tn
 let IsSignatureDataVersionAttr cattr = isILAttrib (tref_SignatureDataVersionAttr ()) cattr
 let TryFindAutoOpenAttr (ilg : IL.ILGlobals) cattr = 
     if isILAttrib (tref_AutoOpenAttr ()) cattr then 
-        // ok to use ecmaILGlobals here since we're querying metadata, not making it
-        match decodeILAttribData ilg cattr None with 
+        match decodeILAttribData ilg cattr with 
         |  [ILAttribElem.String s],_ -> s
         |  [],_ -> None
         | _ -> 
@@ -6159,8 +6157,7 @@ let tref_InternalsVisibleToAttr (ilg : IL.ILGlobals) =
 
 let TryFindInternalsVisibleToAttr ilg cattr = 
     if isILAttrib (tref_InternalsVisibleToAttr ilg) cattr then 
-        // ok to use ecmaILGlobals here since we're querying metadata, not making it
-        match decodeILAttribData ilg cattr None with 
+        match decodeILAttribData ilg cattr with 
         |  [ILAttribElem.String s],_ -> s
         |  [],_ -> None
         | _ -> 
@@ -6171,8 +6168,7 @@ let TryFindInternalsVisibleToAttr ilg cattr =
 
 let IsMatchingSignatureDataVersionAttr ilg ((v1,v2,v3,_) : ILVersionInfo)  cattr = 
     IsSignatureDataVersionAttr cattr &&
-    // ok to use ecmaILGlobals here since we're querying metadata, not making it 
-    match decodeILAttribData ilg cattr None with 
+    match decodeILAttribData ilg cattr with 
     |  [ILAttribElem.Int32 u1; ILAttribElem.Int32 u2;ILAttribElem.Int32 u3 ],_ -> 
         (v1 = uint16 u1) && (v2 = uint16 u2) && (v3 = uint16 u3)
     | _ -> 

src/fsharp/TastOps.fsi

@@ -1197,7 +1197,7 @@ val mkLdelem : TcGlobals -> range -> TType -> Expr -> Expr -> Expr
 // Analyze attribute sets 
 //------------------------------------------------------------------------- 
 
-val TryDecodeILAttribute   : TcGlobals -> ILTypeRef -> ILScopeRef option -> ILAttributes -> (ILAttribElem list * ILAttributeNamedArg list) option
+val TryDecodeILAttribute   : TcGlobals -> ILTypeRef -> ILAttributes -> (ILAttribElem list * ILAttributeNamedArg list) option
 val TryFindILAttribute : BuiltinAttribInfo -> ILAttributes -> bool
 val TryFindILAttributeOpt : BuiltinAttribInfo option -> ILAttributes -> bool
 

src/fsharp/TypeChecker.fs

@@ -9764,7 +9764,7 @@ and TcAttribute cenv (env: TcEnv) attrTgt (synAttr: SynAttribute)  =
                 let tdef = tcref.ILTyconRawMetadata
                 let tref = cenv.g.attrib_AttributeUsageAttribute.TypeRef
 
-                match TryDecodeILAttribute cenv.g tref (Some(tref.Scope)) tdef.CustomAttrs with 
+                match TryDecodeILAttribute cenv.g tref tdef.CustomAttrs with 
                 | Some ([ILAttribElem.Int32 validOn ],named) -> 
                     let inherited = 
                         match List.tryPick (function ("Inherited",_,_,ILAttribElem.Bool res) -> Some res | _ -> None) named with 

src/fsharp/fsc.fsi

@@ -11,8 +11,6 @@ open Microsoft.FSharp.Compiler.TcGlobals
 open Microsoft.FSharp.Compiler.Tast
 open Microsoft.FSharp.Compiler.TypeChecker
 
-type SigningInfo = SigningInfo of (* delaysign:*) bool * (*signer:*)  string option * (*container:*) string option
-
 [<AbstractClass>]
 type ErrorLoggerProvider =
     new : unit -> ErrorLoggerProvider
@@ -24,6 +22,8 @@ val internal ProcessCommandLineArgsAndImportAssemblies : (string -> unit) * stri
 #if NO_COMPILER_BACKEND
 #else
 
+type SigningInfo = SigningInfo of (* delaysign:*) bool * (*signer:*)  string option * (*container:*) string option
+
 val EncodeInterfaceData: tcConfig:TcConfig * tcGlobals:TcGlobals * exportRemapping:Tastops.Remap * generatedCcu: Tast.CcuThunk * outfile: string -> ILAttribute list * ILResource list
 val ValidateKeySigningAttributes : tcConfig:TcConfig * tcGlobals:TcGlobals * TypeChecker.TopAttribs -> SigningInfo
 val GetSigner : SigningInfo -> ILBinaryWriter.ILStrongNameSigner option

src/fsharp/infos.fs

@@ -763,7 +763,7 @@ type ILMethInfo =
     member x.IsDllImport g = 
         match g.attrib_DllImportAttribute with
         | None -> false
-        | Some (AttribInfo(tref,_)) ->x.RawMetadata.CustomAttrs |> TryDecodeILAttribute g tref (Some tref.Scope)  |> isSome
+        | Some (AttribInfo(tref,_)) ->x.RawMetadata.CustomAttrs |> TryDecodeILAttribute g tref  |> isSome
 
     /// Get the (zero or one) 'self'/'this'/'object' arguments associated with an IL method. 
     /// An instance extension method returns one object argument.
@@ -1252,7 +1252,7 @@ type MethInfo =
             [ [ for p in ilMethInfo.ParamMetadata do
                  let isParamArrayArg = TryFindILAttribute g.attrib_ParamArrayAttribute p.CustomAttrs
                  let reflArgInfo = 
-                     match TryDecodeILAttribute g g.attrib_ReflectedDefinitionAttribute.TypeRef (Some(g.attrib_ReflectedDefinitionAttribute.TypeRef.Scope)) p.CustomAttrs with 
+                     match TryDecodeILAttribute g g.attrib_ReflectedDefinitionAttribute.TypeRef p.CustomAttrs with 
                      | Some ([ILAttribElem.Bool b ],_) ->  ReflectedArgInfo.Quote b
                      | Some _ -> ReflectedArgInfo.Quote false
                      | _ -> ReflectedArgInfo.None
@@ -2651,7 +2651,7 @@ type AttribInfo =
                     let obj = evalFSharpAttribArg g evaluatedExpr
                     ty,obj) 
          | ILAttribInfo (g, amap, scoref, cattr, m) -> 
-              let parms, _args = decodeILAttribData g.ilg cattr (Some scoref) 
+              let parms, _args = decodeILAttribData g.ilg cattr 
               [ for (argty,argval) in Seq.zip cattr.Method.FormalArgTypes parms ->
                     let ty = ImportType scoref amap m [] argty
                     let obj = evalILAttribElem argval
@@ -2666,7 +2666,7 @@ type AttribInfo =
                     let obj = evalFSharpAttribArg g evaluatedExpr
                     ty, nm, isField, obj) 
          | ILAttribInfo (g, amap, scoref, cattr, m) -> 
-              let _parms, namedArgs = decodeILAttribData g.ilg cattr (Some scoref) 
+              let _parms, namedArgs = decodeILAttribData g.ilg cattr 
               [ for (nm, argty, isProp, argval) in namedArgs ->
                     let ty = ImportType scoref amap m [] argty
                     let obj = evalILAttribElem argval
@@ -2753,7 +2753,7 @@ module AttributeChecking =
             | None -> None
 #endif
         | ILTypeMetadata (_,tdef) -> 
-            match TryDecodeILAttribute g atref (Some(atref.Scope)) tdef.CustomAttrs with 
+            match TryDecodeILAttribute g atref tdef.CustomAttrs with 
             | Some attr -> f1 attr
             | _ -> None
         | FSharpOrArrayOrByrefOrTupleOrExnTypeMetadata -> 
@@ -2782,7 +2782,7 @@ module AttributeChecking =
         ignore f3
 #endif
         BindMethInfoAttributes m minfo 
-            (fun ilAttribs -> TryDecodeILAttribute g atref (Some(atref.Scope)) ilAttribs |> Option.bind f1)
+            (fun ilAttribs -> TryDecodeILAttribute g atref ilAttribs |> Option.bind f1)
             (fun fsAttribs -> TryFindFSharpAttribute g attribSpec fsAttribs |> Option.bind f2)
 #if EXTENSIONTYPING
             (fun provAttribs -> 
@@ -2815,7 +2815,7 @@ module AttributeChecking =
     /// Check IL attributes for 'ObsoleteAttribute', returning errors and warnings as data
     let private CheckILAttributes g cattrs m = 
         let (AttribInfo(tref,_)) = g.attrib_SystemObsolete
-        match TryDecodeILAttribute g tref (Some(tref.Scope)) cattrs with 
+        match TryDecodeILAttribute g tref cattrs with 
         | Some ([ILAttribElem.String (Some msg) ],_) -> 
              WarnD(ObsoleteWarning(msg,m))
         | Some ([ILAttribElem.String (Some msg); ILAttribElem.Bool isError ],_) -> 
@@ -2900,7 +2900,7 @@ module AttributeChecking =
     /// Indicate if a list of IL attributes contains 'ObsoleteAttribute'. Used to suppress the item in intellisense.
     let CheckILAttributesForUnseen g cattrs _m = 
         let (AttribInfo(tref,_)) = g.attrib_SystemObsolete
-        isSome (TryDecodeILAttribute g tref (Some(tref.Scope)) cattrs)
+        isSome (TryDecodeILAttribute g tref cattrs)
 
     /// Checks the attributes for CompilerMessageAttribute, which has an IsHidden argument that allows
     /// items to be suppressed from intellisense.

src/fsharp/vs/Symbols.fs

@@ -1737,8 +1737,8 @@ and FSharpAttribute(cenv: cenv, attrib: AttribInfo) =
             match attrib with
             | AttribInfo.FSAttribInfo(g, attrib) ->
                 NicePrint.stringOfFSAttrib (denv.Contents g) attrib
-            | AttribInfo.ILAttribInfo (g, _, scoref, cattr, _) -> 
-                let parms, _args = decodeILAttribData g.ilg cattr (Some scoref) 
+            | AttribInfo.ILAttribInfo (g, _, _scoref, cattr, _) -> 
+                let parms, _args = decodeILAttribData g.ilg cattr 
                 NicePrint.stringOfILAttrib (denv.Contents g) (cattr.Method.EnclosingType, parms)
 
     override __.ToString() =