baselines + fsx

Author: KevinRansom

src/Compiler/CodeGen/IlxGen.fs

@@ -777,7 +777,8 @@ let GetDynamicallyAccessedMemberTypes cenv =
 
     if not (cenv.g.compilingFSharpCore) then
         cenv.g.TryEmbedILType(
-            tref, (fun () ->
+            tref,
+            (fun () ->
                 let values =
                     [|
                         ("All", -1)
@@ -798,23 +799,36 @@ let GetDynamicallyAccessedMemberTypes cenv =
                         ("Interfaces", 8192)
                     |]
 
-                mkLocalPrivateInt32Enum (cenv, tref, values)))
+                mkLocalPrivateInt32Enum (cenv, tref, values))
+        )
 
     ILType.Value(mkILNonGenericTySpec (tref))
 
 let GetDynamicDependencyAttribute cenv memberTypes ilType =
     let tref = cenv.g.attrib_DynamicDependencyAttribute.TypeRef
 
     cenv.g.TryEmbedILType(
-        tref, (
-            fun () ->
-            let properties = Some [ "MemberType", GetDynamicallyAccessedMemberTypes cenv; "Type", cenv.g.ilg.typ_Type ]
-            mkLocalPrivateAttributeWithPropertyConstructors (cenv, tref.Name, properties)))
+        tref,
+        (fun () ->
+            let properties =
+                Some
+                    [
+                        "MemberType", GetDynamicallyAccessedMemberTypes cenv
+                        "Type", cenv.g.ilg.typ_Type
+                    ]
+
+            mkLocalPrivateAttributeWithPropertyConstructors (cenv, tref.Name, properties))
+    )
 
     let typIlMemberTypes =
         ILType.Value(mkILNonGenericTySpec (cenv.g.enum_DynamicallyAccessedMemberTypes.TypeRef))
 
-    mkILCustomAttribute (tref, [ typIlMemberTypes; cenv.g.ilg.typ_Type ], [ ILAttribElem.Int32 memberTypes; ILAttribElem.Type (Some ilType) ], [])
+    mkILCustomAttribute (
+        tref,
+        [ typIlMemberTypes; cenv.g.ilg.typ_Type ],
+        [ ILAttribElem.Int32 memberTypes; ILAttribElem.Type(Some ilType) ],
+        []
+    )
 
 /// Generate "modreq([mscorlib]System.Runtime.InteropServices.InAttribute)" on inref types.
 let GenReadOnlyModReqIfNecessary (g: TcGlobals) ty ilTy =
@@ -11244,7 +11258,17 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) =
                                 reprAccess,
                                 None,
                                 eenv.imports
-                            )).With(customAttrs = mkILCustomAttrs [ GetDynamicDependencyAttribute cenv 0x660 (*Public and NonPublic Fields and Properties*) ilThisTy ])
+                            ))
+                                .With(
+                                    customAttrs =
+                                        mkILCustomAttrs
+                                            [
+                                                GetDynamicDependencyAttribute
+                                                    cenv
+                                                    0x660 (*Public and NonPublic Fields and Properties*)
+                                                    ilThisTy
+                                            ]
+                                )
 
                         yield ilMethodDef
                         // FSharp 1.0 bug 1988: Explicitly setting the ComVisible(true) attribute on an F# type causes an F# record to be emitted in a way that enables mutation for COM interop scenarios

src/Compiler/Driver/CreateILModule.fs

@@ -304,7 +304,7 @@ module MainModuleBuilder =
         RequireCompilationThread ctok
 
         let ilTypeDefs =
-            mkILTypeDefs (codegenResults.ilTypeDefs @ tcGlobals.embeddedTypeDefs)
+            mkILTypeDefs (codegenResults.ilTypeDefs @ tcGlobals.tryRemoveEmbeddedILTypeDefs ())
 
         let mainModule =
             let hashAlg =

src/Compiler/Interactive/fsi.fs

@@ -1426,8 +1426,9 @@ type internal FsiDynamicCompiler(
 
     /// Generate one assembly using multi-assembly emit
     let EmitInMemoryAssembly (tcConfig: TcConfig, emEnv: ILMultiInMemoryAssemblyEmitEnv, ilxMainModule: ILModuleDef) =
+        let embeddedTypes = tcGlobals.tryRemoveEmbeddedILTypeDefs() |> List.filter(fun tdef -> not(emEnv.IsLocalInternalType(mkRefForNestedILTypeDef ILScopeRef.Local ([], tdef))))
+        let ilxMainModule = { ilxMainModule with TypeDefs = mkILTypeDefs (ilxMainModule.TypeDefs.AsList() @ embeddedTypes) }
         let multiAssemblyName = ilxMainModule.ManifestOfAssembly.Name
-
         // Adjust the assembly name of this fragment, and add InternalsVisibleTo attributes to 
         // allow internals access by all future assemblies with the same name (and only differing in version)
         let manifest =

src/Compiler/TypedTree/TcGlobals.fs

@@ -1051,6 +1051,13 @@ type TcGlobals(
 
   member _.embeddedTypeDefs = embeddedILTypeDefs.Values |> Seq.toList
 
+  member _.tryRemoveEmbeddedILTypeDefs () = [
+      for key in embeddedILTypeDefs.Keys do
+        match (embeddedILTypeDefs.TryRemove(key)) with
+        | true, ilTypeDef -> yield ilTypeDef
+        | false, _ -> ()
+      ]
+
   // A table of all intrinsics that the compiler cares about
   member _.knownIntrinsics = v_knownIntrinsics