Remove reshaped_reflection

dotnet · May 24, 2019 · 009921e · 009921e
1 parent 373fae6
commit 009921e
Show file tree

Hide file tree

Showing 45 changed files with 27 additions and 932 deletions.
diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props
@@ -5,7 +5,6 @@
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
     <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
-    <DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_LCIDFROMCODEPAGE</DefineConstants>
   </PropertyGroup>
 
@@ -16,17 +15,12 @@
     <DefineConstants>$(DefineConstants);FX_NO_LINKEDRESOURCES</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_RUNTIMEENVIRONMENT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_SERVERCODEPAGES</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
     <OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
   </PropertyGroup>

diff --git a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
@@ -12,13 +12,9 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!-- Tests won't run without this, at least on OSX, see https://github.com/NuGet/Home/issues/4837#issuecomment-354536302 -->
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <DefineConstants>$(DefineConstants);FX_NO_RUNTIMEENVIRONMENT</DefineConstants>
     <DefineConstants>$(DefineConstants);NO_PROJECTCRACKER</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(FSharpSourcesRoot)\..\tests\service\ReshapedReflection.fs">
-      <Link>ReshapedReflection.fs</Link>
-    </Compile>
     <Compile Include="$(FSharpSourcesRoot)\..\tests\service\FsUnit.fs">
       <Link>FsUnit.fs</Link>
     </Compile>

diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -34,7 +34,6 @@
     <DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_LINKEDRESOURCES</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
-    <DefineConstants>$(DefineConstants);FX_NO_RUNTIMEENVIRONMENT</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
@@ -67,9 +66,6 @@
     <Compile Include="$(FSharpSourcesRoot)/fsharp/Logger.fs">
       <Link>Logger.fs</Link>
     </Compile>
-    <Compile Include="$(FSharpSourcesRoot)/utils/reshapedreflection.fs">
-      <Link>Reshaped/reshapedreflection.fs</Link>
-    </Compile>
     <Compile Include="$(FSharpSourcesRoot)/utils/sformat.fsi">
       <Link>ErrorText/sformat.fsi</Link>
     </Compile>

diff --git a/src/absil/illib.fs b/src/absil/illib.fs
@@ -12,10 +12,6 @@ open System.Reflection
 open System.Threading
 open System.Runtime.CompilerServices
 
-#if FX_RESHAPED_REFLECTION
-open Microsoft.FSharp.Core.ReflectionAdapters
-#endif
-
 // Logical shift right treating int32 as unsigned integer.
 // Code that uses this should probably be adjusted to use unsigned integer types.
 let (>>>&) (x: int32) (n: int32) = int32 (uint32 x >>> n)
@@ -258,12 +254,6 @@ module Option =
 
 module List = 
 
-    //let item n xs = List.nth xs n
-#if FX_RESHAPED_REFLECTION
-    open PrimReflectionAdapters
-    open Microsoft.FSharp.Core.ReflectionAdapters
-#endif
-
     let sortWithOrder (c: IComparer<'T>) elements = List.sortWith (Order.toFunction c) elements
 
     let splitAfter n l = 
@@ -1272,11 +1262,6 @@ type LayeredMultiMap<'Key, 'Value when 'Key : equality and 'Key : comparison>(co
 [<AutoOpen>]
 module Shim =
 
-#if FX_RESHAPED_REFLECTION
-    open PrimReflectionAdapters
-    open Microsoft.FSharp.Core.ReflectionAdapters
-#endif
-
     type IFileSystem = 
 
         /// A shim over File.ReadAllBytes

diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs
@@ -24,10 +24,6 @@ open FSharp.Compiler.ErrorLogger
 open FSharp.Compiler.Range
 open FSharp.Core.Printf
 
-#if FX_RESHAPED_REFLECTION
-open Microsoft.FSharp.Core.ReflectionAdapters
-#endif
-
 let codeLabelOrder = ComparisonIdentity.Structural<ILCodeLabel>
 
 // Convert the output of convCustomAttr
@@ -661,9 +657,6 @@ let TypeBuilderInstantiationT =
     ty
 
 let typeIsNotQueryable (ty: Type) = 
-#if FX_RESHAPED_REFLECTION
-    let ty = ty.GetTypeInfo()
-#endif
     (ty :? TypeBuilder) || ((ty.GetType()).Equals(TypeBuilderInstantiationT))
 //----------------------------------------------------------------------------
 // convFieldSpec
@@ -792,11 +785,7 @@ let queryableTypeGetMethod cenv emEnv parentT (mref: ILMethodRef) =
               parentT.GetMethod(mref.Name, cconv ||| BindingFlags.Public ||| BindingFlags.NonPublic, 
                                 null, 
                                 argTs, 
-#if FX_RESHAPED_REFLECTION
-                                (null: obj[]))
-#else
                                 (null: ParameterModifier[]))
-#endif
             // This can fail if there is an ambiguity w.r.t. return type 
             with _ -> null
         if (isNonNull methInfo && equalTypes resT methInfo.ReturnType) then 
@@ -1432,11 +1421,7 @@ let buildGenParamsPass1 _emEnv defineGenericParameters (gps: ILGenericParameterD
 
 
 let buildGenParamsPass1b cenv emEnv (genArgs: Type array) (gps: ILGenericParameterDefs) = 
-#if FX_RESHAPED_REFLECTION
-    let genpBs = genArgs |> Array.map (fun x -> (x.GetTypeInfo() :?> GenericTypeParameterBuilder)) 
-#else
     let genpBs = genArgs |> Array.map (fun x -> (x :?> GenericTypeParameterBuilder)) 
-#endif
     gps |> List.iteri (fun i (gp: ILGenericParameterDef) ->
         let gpB = genpBs.[i]
         // the Constraints are either the parent (base) type or interfaces.

diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs
@@ -3035,9 +3035,6 @@ module FileSystemUtilites =
     open System
     open System.Reflection
     open System.Globalization
-#if FX_RESHAPED_REFLECTION
-    open Microsoft.FSharp.Core.ReflectionAdapters
-#endif
     let progress = try System.Environment.GetEnvironmentVariable("FSharp_DebugSetFilePermissions") <> null with _ -> false
     let setExecutablePermission (filename: string) =
 

diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -18,7 +18,6 @@
     <InternalsVisibleTo Include="VisualFSharp.UnitTests" />
     <EmbeddedText Include="FSBuild.txt" />
     <Compile Include="..\..\utils\CompilerLocationUtils.fs" />
-    <Compile Include="..\..\utils\reshapedreflection.fs" />
     <Compile Include="FSharpCommandLineBuilder.fs" />
     <Compile Include="Fsc.fs" />
     <Compile Include="Fsi.fs" />

diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
@@ -21,7 +21,6 @@
 
   <ItemGroup>
     <EmbeddedText Include="..\FSInteractiveSettings.txt" />
-    <Compile Include="..\..\utils\reshapedreflection.fs" />
     <Compile Include="..\fsiattrs.fs" />
     <Compile Include="..\fsiaux.fsi" />
     <Compile Include="..\fsiaux.fs" />

diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -73,12 +73,6 @@
     <Compile Include="..\Logger.fs">
       <Link>Logger.fs</Link>
     </Compile>
-    <Compile Include="..\..\utils\reshapedreflection.fs">
-      <Link>Reflection\reshapedreflection.fs</Link>
-    </Compile>
-    <Compile Include="..\..\utils\reshapedmsbuild.fs">
-      <Link>Reflection\reshapedmsbuild.fs</Link>
-    </Compile>
     <Compile Include="..\..\utils\sformat.fsi">
       <Link>ErrorText\sformat.fsi</Link>
     </Compile>

diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -113,9 +113,6 @@
     <Compile Include="set.fs">
       <Link>Collections/set.fs</Link>
     </Compile>
-    <Compile Include="..\..\utils\reshapedreflection.fs">
-      <Link>Reflection/reshapedreflection.fs</Link>
-    </Compile>
     <Compile Include="reflect.fsi">
       <Link>Reflection/reflect.fsi</Link>
     </Compile>

diff --git a/src/fsharp/FSharp.Core/Linq.fs b/src/fsharp/FSharp.Core/Linq.fs
@@ -162,11 +162,6 @@ open Microsoft.FSharp.Quotations
 open Microsoft.FSharp.Quotations.Patterns
 open Microsoft.FSharp.Quotations.DerivedPatterns
 
-#if FX_RESHAPED_REFLECTION
-open PrimReflectionAdapters
-open ReflectionAdapters
-#endif
-
 module LeafExpressionConverter =
 
     // The following is recognized as a LINQ 'member initialization pattern' in a quotation.
@@ -219,11 +214,7 @@ module LeafExpressionConverter =
         SubstHelperRaw(q, x, y) |> Expr.Cast
 
     let showAll =
-#if FX_RESHAPED_REFLECTION
-        true
-#else
         BindingFlags.Public ||| BindingFlags.NonPublic
-#endif
 
     let NullableConstructor =
         typedefof<Nullable<int>>.GetConstructors().[0]

diff --git a/src/fsharp/FSharp.Core/Query.fs b/src/fsharp/FSharp.Core/Query.fs
@@ -302,11 +302,6 @@ open Microsoft.FSharp.Quotations.DerivedPatterns
 
 open Microsoft.FSharp.Linq.QueryRunExtensions
 
-#if FX_RESHAPED_REFLECTION
-open PrimReflectionAdapters
-open ReflectionAdapters
-#endif
-
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module Query =
 

diff --git a/src/fsharp/FSharp.Core/QueryExtensions.fs b/src/fsharp/FSharp.Core/QueryExtensions.fs
@@ -15,11 +15,6 @@ open System.Collections.Generic
 open System.Linq
 open System.Linq.Expressions
 
-#if FX_RESHAPED_REFLECTION
-open PrimReflectionAdapters
-open ReflectionAdapters
-#endif
-
 // ----------------------------------------------------------------------------
 
 /// A type used to reconstruct a grouping after applying a mutable->immutable mapping transformation 
@@ -171,11 +166,7 @@ module internal Adapters =
     let (|RecordFieldGetSimplification|_|) (expr:Expr) = 
         match expr with 
         | Patterns.PropertyGet(Some (Patterns.NewRecord(typ,els)),propInfo,[]) ->
-#if FX_RESHAPED_REFLECTION
-            let fields = Microsoft.FSharp.Reflection.FSharpType.GetRecordFields(typ, true) 
-#else
             let fields = Microsoft.FSharp.Reflection.FSharpType.GetRecordFields(typ,System.Reflection.BindingFlags.Public|||System.Reflection.BindingFlags.NonPublic) 
-#endif
             match fields |> Array.tryFindIndex (fun p -> p = propInfo) with 
             | None -> None
             | Some i -> if i < els.Length then Some els.[i] else None

diff --git a/src/fsharp/FSharp.Core/array.fs b/src/fsharp/FSharp.Core/array.fs
@@ -10,9 +10,6 @@ namespace Microsoft.FSharp.Collections
     open Microsoft.FSharp.Core.Operators
     open Microsoft.FSharp.Core.CompilerServices
     open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
-#if FX_RESHAPED_REFLECTION
-    open System.Reflection
-#endif
 
     /// Basic operations on arrays
     [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
@@ -191,11 +188,7 @@ namespace Microsoft.FSharp.Collections
         [<CompiledName("CountBy")>]
         let countBy (projection: 'T->'Key) (array: 'T[]) =
             checkNonNull "array" array
-#if FX_RESHAPED_REFLECTION
-            if (typeof<'Key>).GetTypeInfo().IsValueType
-#else
             if typeof<'Key>.IsValueType
-#endif
                 then countByValueType projection array
                 else countByRefType   projection array
 
@@ -445,11 +438,7 @@ namespace Microsoft.FSharp.Collections
         [<CompiledName("GroupBy")>]
         let groupBy (projection: 'T->'Key) (array: 'T[]) =
             checkNonNull "array" array
-#if FX_RESHAPED_REFLECTION
-            if (typeof<'Key>).GetTypeInfo().IsValueType
-#else
             if typeof<'Key>.IsValueType
-#endif
                 then groupByValueType projection array
                 else groupByRefType   projection array
 

diff --git a/src/fsharp/FSharp.Core/async.fs b/src/fsharp/FSharp.Core/async.fs
@@ -17,10 +17,6 @@ namespace Microsoft.FSharp.Control
     open Microsoft.FSharp.Control
     open Microsoft.FSharp.Collections
 
-#if FX_RESHAPED_REFLECTION
-    open ReflectionAdapters
-#endif
-
     type LinkedSubSource(cancellationToken: CancellationToken) =
 
         let failureCTS = new CancellationTokenSource()
@@ -1701,8 +1697,6 @@ namespace Microsoft.FSharp.Control
                     | _ ->
                         None)
 
-#if !FX_NO_WEB_CLIENT
-
         type System.Net.WebClient with
             member inline private this.Download(event: IEvent<'T, _>, handler: _ -> 'T, start, result) =
                 let downloadAsync =
@@ -1754,5 +1748,3 @@ namespace Microsoft.FSharp.Control
                     start   = (fun userToken -> this.DownloadFileAsync(address, fileName, userToken)),
                     result  = (fun _         -> ())
                 )
-#endif
-
diff --git a/src/fsharp/FSharp.Core/async.fsi b/src/fsharp/FSharp.Core/async.fsi
@@ -739,8 +739,7 @@ namespace Microsoft.FSharp.Control
             /// <returns>An asynchronous computation that waits for response to the <c>WebRequest</c>.</returns>
             [<CompiledName("AsyncGetResponse")>] // give the extension member a nice, unmangled compiled name, unique within this module
             member AsyncGetResponse : unit -> Async<System.Net.WebResponse>
-
-#if !FX_NO_WEB_CLIENT
+
         type System.Net.WebClient with
 
             /// <summary>Returns an asynchronous computation that, when run, will wait for the download of the given URI.</summary>
@@ -761,7 +760,6 @@ namespace Microsoft.FSharp.Control
             /// <returns>An asynchronous computation that will wait for the download of the URI to specified file.</returns>
             [<CompiledName("AsyncDownloadFile")>] // give the extension member a nice, unmangled compiled name, unique within this module
             member AsyncDownloadFile : address:System.Uri * fileName: string -> Async<unit>
-#endif
 
     // Internals used by MailboxProcessor
     module internal AsyncBuilderImpl = 

diff --git a/src/fsharp/FSharp.Core/event.fs b/src/fsharp/FSharp.Core/event.fs
@@ -11,10 +11,6 @@ namespace Microsoft.FSharp.Control
     open System.Reflection
     open System.Diagnostics
 
-#if FX_RESHAPED_REFLECTION
-    open ReflectionAdapters
-#endif
-
     [<CompiledName("FSharpDelegateEvent`1")>]
     type DelegateEvent<'Delegate when 'Delegate :> System.Delegate>() = 
         let mutable multicast : System.Delegate = null

diff --git a/src/fsharp/FSharp.Core/fslib-extra-pervasives.fs b/src/fsharp/FSharp.Core/fslib-extra-pervasives.fs
@@ -166,21 +166,13 @@ module ExtraTopLevelOperators =
 
     [<CompiledName("CreateDictionary")>]
     let dict (keyValuePairs:seq<'Key*'T>) : IDictionary<'Key,'T> =
-#if FX_RESHAPED_REFLECTION
-        if (typeof<'Key>).GetTypeInfo().IsValueType
-#else
         if typeof<'Key>.IsValueType
-#endif
             then dictValueType keyValuePairs :> _
             else dictRefType   keyValuePairs :> _
 
     [<CompiledName("CreateReadOnlyDictionary")>]
     let readOnlyDict (keyValuePairs:seq<'Key*'T>) : IReadOnlyDictionary<'Key,'T> =
-#if FX_RESHAPED_REFLECTION
-        if (typeof<'Key>).GetTypeInfo().IsValueType
-#else
         if typeof<'Key>.IsValueType
-#endif
             then dictValueType keyValuePairs :> _
             else dictRefType   keyValuePairs :> _
 

diff --git a/src/fsharp/FSharp.Core/list.fs b/src/fsharp/FSharp.Core/list.fs
@@ -9,9 +9,6 @@ namespace Microsoft.FSharp.Collections
     open Microsoft.FSharp.Collections
     open Microsoft.FSharp.Core.CompilerServices
     open System.Collections.Generic
-#if FX_RESHAPED_REFLECTION
-    open System.Reflection
-#endif
 
     [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
     [<RequireQualifiedAccess>]
@@ -71,11 +68,7 @@ namespace Microsoft.FSharp.Collections
 
         [<CompiledName("CountBy")>]
         let countBy (projection:'T->'Key) (list:'T list) =
-#if FX_RESHAPED_REFLECTION
-            if (typeof<'Key>).GetTypeInfo().IsValueType
-#else
             if typeof<'Key>.IsValueType
-#endif
                 then countByValueType projection list
                 else countByRefType   projection list
 
@@ -446,11 +439,7 @@ namespace Microsoft.FSharp.Collections
 
         [<CompiledName("GroupBy")>]
         let groupBy (projection:'T->'Key) (list:'T list) =
-#if FX_RESHAPED_REFLECTION
-            if (typeof<'Key>).GetTypeInfo().IsValueType
-#else
             if typeof<'Key>.IsValueType
-#endif
                 then groupByValueType projection list
                 else groupByRefType   projection list