Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dsyme tuple spike #8

Merged
merged 4 commits into from
Jul 26, 2016
Merged

Dsyme tuple spike #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ae8402
feedback
KevinRansom Jul 25, 2016
2496cd7
Cache Tuple gets
KevinRansom Jul 26, 2016
7295a8f
Merge branch 'tuple-spike' of https://github.com/dsyme/visualfsharp i…
KevinRansom Jul 26, 2016
152cb30
Stop fsi from auto-referencing System.ValueTuple.dll
KevinRansom Jul 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ echo Usage:
echo.
echo build.cmd ^all^|ci^|ci_part1^|ci_part2^|microbuild^|proto^|net40^|coreclr^|debug^|release^|diag^|compiler^|pcls^|vs^
echo ^test-coreunit^|test-corecompile^|test-smoke^|test-coreclr^|test-pcls^|test-fsharp^|test-fsharpqa^|test-vs^
echo.
echo No arguments default to 'build'
echo. rate strings by comma
echo To specify multiple values, sepa
echo.
echo No arguments default to 'build'
echo.
echo To specify multiple values, separate strings by comma
echo.
echo.This builds the net40 build of the compiler without running tests
echo.
Expand Down
2 changes: 0 additions & 2 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1618,7 +1618,6 @@ let DefaultBasicReferencesForOutOfProjectSources =
yield "System.Runtime.Serialization.Formatters.Soap"
yield "System.Data"
yield "System.Drawing"
yield "System.ValueTuple"

// Don't reference System.Core for .NET 2.0 compilations.
//
Expand Down Expand Up @@ -1693,7 +1692,6 @@ let SystemAssemblies primaryAssemblyName =
yield "System.Threading.Thread"
yield "System.Threading.ThreadPool"
yield "System.Threading.Timer"
yield "System.ValueTuple"
]

// The set of references entered into the TcConfigBuilder for scripts prior to computing
Expand Down
83 changes: 46 additions & 37 deletions src/fsharp/FSharp.Core/reflect.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ namespace Microsoft.FSharp.Core

open System
open System.Reflection
open System.Threading
open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
open Microsoft.FSharp.Collections

Expand Down Expand Up @@ -390,44 +391,52 @@ module internal Impl =
// Which field holds the nested tuple?
let tupleEncField = maxTuple-1

let rec mkTupleType isStruct (asm:Assembly) (tys: Type[]) =
let tupleFullName n =
if isStruct then
match n with
| 1 -> "System.ValueTuple`1"
| 2 -> "System.ValueTuple`2"
| 3 -> "System.ValueTuple`3"
| 4 -> "System.ValueTuple`4"
| 5 -> "System.ValueTuple`5"
| 6 -> "System.ValueTuple`6"
| 7 -> "System.ValueTuple`7"
| 8 -> "System.ValueTuple`8"
| _ -> "System.ValueTuple"
else
let dictionaryLock = obj()
let refTupleTypes = System.Collections.Generic.Dictionary<Assembly, Type[]>()
let valueTupleTypes = System.Collections.Generic.Dictionary<Assembly, Type[]>()

let rec mkTupleType isStruct (asm:Assembly) (tys:Type[]) =
let table =
let makeIt n =
let tupleFullName n =
let structOffset = if isStruct then 9 else 0
let index = n - 1 + structOffset
tupleNames.[index]

match n with
| 1 -> "System.Tuple`1"
| 2 -> "System.Tuple`2"
| 3 -> "System.Tuple`3"
| 4 -> "System.Tuple`4"
| 5 -> "System.Tuple`5"
| 6 -> "System.Tuple`6"
| 7 -> "System.Tuple`7"
| 8 -> "System.Tuple`8"
| _ -> "System.Tuple"

match tys.Length with
| 1 -> asm.GetType(tupleFullName 1).MakeGenericType(tys)
| 2 -> asm.GetType(tupleFullName 2).MakeGenericType(tys)
| 3 -> asm.GetType(tupleFullName 3).MakeGenericType(tys)
| 4 -> asm.GetType(tupleFullName 4).MakeGenericType(tys)
| 5 -> asm.GetType(tupleFullName 5).MakeGenericType(tys)
| 6 -> asm.GetType(tupleFullName 6).MakeGenericType(tys)
| 7 -> asm.GetType(tupleFullName 7).MakeGenericType(tys)
| n when n >= maxTuple ->
| 1 -> asm.GetType(tupleFullName 1)
| 2 -> asm.GetType(tupleFullName 2)
| 3 -> asm.GetType(tupleFullName 3)
| 4 -> asm.GetType(tupleFullName 4)
| 5 -> asm.GetType(tupleFullName 5)
| 6 -> asm.GetType(tupleFullName 6)
| 7 -> asm.GetType(tupleFullName 7)
| 8 -> asm.GetType(tupleFullName 8)
| _ -> invalidArg "tys" (SR.GetString(SR.invalidTupleTypes))

let tables = if isStruct then valueTupleTypes else refTupleTypes
match tables.TryGetValue(asm) with
| false, _ ->
let a = ref (Array.init<Type> 8 (fun i -> makeIt (i + 1)))
lock dictionaryLock (fun () -> match tables.TryGetValue(asm) with
| true, t -> a := t
| false, _ -> tables.Add(asm, !a))
!a
| true, t -> t

match tys.Length with
| 1 -> table.[0].MakeGenericType(tys)
| 2 -> table.[1].MakeGenericType(tys)
| 3 -> table.[2].MakeGenericType(tys)
| 4 -> table.[3].MakeGenericType(tys)
| 5 -> table.[4].MakeGenericType(tys)
| 6 -> table.[5].MakeGenericType(tys)
| 7 -> table.[6].MakeGenericType(tys)
| n when n >= maxTuple ->
let tysA = tys.[0..tupleEncField-1]
let tysB = tys.[maxTuple-1..]
let tyB = mkTupleType isStruct asm tysB
asm.GetType(tupleFullName 8).MakeGenericType(Array.append tysA [| tyB |])
table.[7].MakeGenericType(Array.append tysA [| tyB |])
| _ -> invalidArg "tys" (SR.GetString(SR.invalidTupleTypes))

let rec getTupleTypeInfo (typ:Type) =
Expand Down Expand Up @@ -774,13 +783,13 @@ type FSharpType =
invalidArg "types" (SR.GetString(SR.nullsNotAllowedInArray))
Impl.mkTupleType false asm types

static member MakeTupleTypeWithAssembly (asm:Assembly) (types:Type[]) =
static member MakeTupleType (asm:Assembly, types:Type[]) =
Impl.checkNonNull "types" types
if types |> Array.exists (function null -> true | _ -> false) then
invalidArg "types" (SR.GetString(SR.nullsNotAllowedInArray))
Impl.mkTupleType false asm types

static member MakeStructTupleTypeWithAssembly (asm:Assembly) (types:Type[]) =
static member MakeValueTupleType (asm:Assembly, types:Type[]) =
Impl.checkNonNull "types" types
if types |> Array.exists (function null -> true | _ -> false) then
invalidArg "types" (SR.GetString(SR.nullsNotAllowedInArray))
Expand Down Expand Up @@ -875,7 +884,7 @@ type FSharpValue =
let (f : (obj -> obj) -> obj) = downcast o
f implementation

static member MakeTuple(tupleElements: obj[],tupleType:Type) =
static member MakeTuple(tupleElements: obj[], tupleType:Type) =
Impl.checkNonNull "tupleElements" tupleElements
Impl.checkTupleType("tupleType",tupleType)
Impl.getTupleConstructor tupleType tupleElements
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/FSharp.Core/reflect.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,12 @@ type FSharpType =
/// <summary>Returns a <c>System.Type</c> representing an F# tuple type with the given element types</summary>
/// <param name="types">An array of types for the tuple elements.</param>
/// <returns>The type representing the tuple containing the input elements.</returns>
static member MakeTupleTypeWithAssembly: asm:Assembly -> types:Type[] -> Type
static member MakeTupleType: asm:Assembly * types:Type[] -> Type

/// <summary>Returns a <c>System.Type</c> representing an F# struct tuple type with the given element types</summary>
/// <param name="types">An array of types for the tuple elements.</param>
/// <returns>The type representing the struct tuple containing the input elements.</returns>
static member MakeStructTupleTypeWithAssembly: asm:Assembly -> types:Type[] -> Type
static member MakeValueTupleType: asm:Assembly * types:Type[] -> Type

/// <summary>Return true if the <c>typ</c> is a representation of an F# tuple type </summary>
/// <param name="typ">The type to check.</param>
Expand Down
3 changes: 0 additions & 3 deletions tests/fsharpqa/testenv/src/FSharp.Compiler.Hosted/FSharp.Compiler.Hosted.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="..\..\..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll">
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(OpenBuild)' == 'True' ">
<Reference Include="$(OpenDrop)\FSharp.Core.dll">
Expand Down
3 changes: 0 additions & 3 deletions tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="..\..\..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll">
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(OpenBuild)' == 'True' ">
<Reference Include="$(OpenDrop)\FSharp.Core.dll">
Expand Down