Commit44ef814

dsyme

authored and

KevinRansom

committed

Fix 4240 - MakeTuple on struct tuples (dotnet#4387)

* Fix 4240 - MakeTuple on struct tuples* fix this mistake

1 parent2c3cfbf commit44ef814Copy full SHA for 44ef814

File tree

3 files changed

+549

-311

lines changed

src/fsharp/FSharp.Core
- reflect.fs
tests/FSharp.Core.UnitTests
- FSharp.Core.Unittests.fsproj
- FSharp.Core/Microsoft.FSharp.Reflection
  - FSharpReflection.fs

3 files changed

+549

-311

lines changed

`‎src/fsharp/FSharp.Core/reflect.fs‎`

Lines changed: 10 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -484,44 +484,42 @@ module internal Impl =`
`484`	`484`	`#endif`
`485`	`485`	`fields`
`486`	`486`
`487`		`-letgetTupleConstructorMethod(typ:Type,bindingFlags)=`
	`487`	`+letgetTupleConstructorMethod(typ:Type)=`
`488`	`488`	`letctor=`
`489`	`489`	`if typ.IsValueTypethen`
`490`		`-letfields= typ.GetFields(bindingFlags)\|> orderTupleFields`
	`490`	`+letfields= typ.GetFields(instanceFieldFlags\|\|\| BindingFlags.Public)\|> orderTupleFields`
`491`	`491`	`#if FX_RESHAPED_REFLECTION`
`492`		`- ignore bindingFlags`
`493`	`492`	`typ.GetConstructor(fields\|> Array.map(fun fi-> fi.FieldType))`
`494`	`493`	`#else`
`495`		`- typ.GetConstructor(BindingFlags.Instance\|\|\|bindingFlags,null,fields\|> Array.map(fun fi-> fi.FieldType),null)`
	`494`	`+ typ.GetConstructor(BindingFlags.Public\|\|\|BindingFlags.Instance,null,fields\|> Array.map(fun fi-> fi.FieldType),null)`
`496`	`495`	`#endif`
`497`	`496`	`else`
`498`	`497`	`letprops= typ.GetProperties()\|> orderTupleProperties`
`499`	`498`	`#if FX_RESHAPED_REFLECTION`
`500`		`- ignore bindingFlags`
`501`	`499`	`typ.GetConstructor(props\|> Array.map(fun p-> p.PropertyType))`
`502`	`500`	`#else`
`503`		`- typ.GetConstructor(BindingFlags.Instance\|\|\|bindingFlags,null,props\|> Array.map(fun p-> p.PropertyType),null)`
	`501`	`+ typ.GetConstructor(BindingFlags.Public\|\|\|BindingFlags.Instance,null,props\|> Array.map(fun p-> p.PropertyType),null)`
`504`	`502`	`#endif`
`505`	`503`	`match ctorwith`
`506`	`504`	`\|null-> raise<\| ArgumentException(String.Format(SR.GetString(SR.invalidTupleTypeConstructorNotDefined), typ.FullName))`
`507`	`505`	`\|_->()`
`508`	`506`	`ctor`
`509`	`507`
`510`		`-letgetTupleCtor(typ:Type,bindingFlags)=`
`511`		`-letctor= getTupleConstructorMethod(typ,bindingFlags)`
	`508`	`+letgetTupleCtor(typ:Type)=`
	`509`	`+letctor= getTupleConstructorMethodtyp`
`512`	`510`	`(fun(args:obj[])->`
`513`	`511`	`#if FX_RESHAPED_REFLECTION`
`514`	`512`	`ctor.Invoke(args))`
`515`	`513`	`#else`
`516`		`- ctor.Invoke(BindingFlags.InvokeMethod\|\|\| BindingFlags.Instance\|\|\|bindingFlags,null,args,null))`
	`514`	`+ ctor.Invoke(BindingFlags.InvokeMethod\|\|\| BindingFlags.Instance\|\|\|BindingFlags.Public,null,args,null))`
`517`	`515`	`#endif`
`518`	`516`
`519`	`517`	`let recgetTupleReader(typ:Type)=`
`520`	`518`	`letetys= typ.GetGenericArguments()`
`521`	`519`	`// Get the reader for the outer tuple record`
`522`	`520`	`letreader=`
`523`	`521`	`if typ.IsValueTypethen`
`524`		`-letfields=(typ.GetFields(instanceFieldFlags\|\|\| BindingFlags.Public)\|> orderTupleFields)`
	`522`	`+letfields=(typ.GetFields(instanceFieldFlags\|\|\| BindingFlags.Public)\|> orderTupleFields)`
`525`	`523`	`((fun(obj:obj)-> fields\|> Array.map(fun field-> field.GetValue(obj))))`
`526`	`524`	`else`
`527`	`525`	`letprops=(typ.GetProperties(instancePropertyFlags\|\|\| BindingFlags.Public)\|> orderTupleProperties)`
`@@ -538,7 +536,7 @@ module internal Impl =`
`538`	`536`
`539`	`537`	`let recgetTupleConstructor(typ:Type)=`
`540`	`538`	`letetys= typ.GetGenericArguments()`
`541`		`-letmaker1= getTupleCtor(typ,BindingFlags.Public)`
	`539`	`+letmaker1= getTupleCtor typ`
`542`	`540`	`if etys.Length< maxTuple`
`543`	`541`	`then maker1`
`544`	`542`	`else`
`@@ -550,7 +548,7 @@ module internal Impl =`
`550`	`548`
`551`	`549`	`letgetTupleConstructorInfo(typ:Type)=`
`552`	`550`	`letetys= typ.GetGenericArguments()`
`553`		`-letmaker1= getTupleConstructorMethod(typ,BindingFlags.Public)`
	`551`	`+letmaker1= getTupleConstructorMethod typ`
`554`	`552`	`if etys.Length< maxTuplethen`
`555`	`553`	`maker1,None`
`556`	`554`	`else`

`‎tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`<HintPathCondition="'$(TargetDotnetProfile)' == 'net40'">$(FsCheckLibDir)\net45\FsCheck.dll</HintPath>`
`53`	`53`	`</Reference>`
`54`	`54`	`<ReferenceInclude="System.ValueTuple">`
`55`		`- <HintPath>..\..\..\packages\System.ValueTuple.4.3.1\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>`
	`55`	`+ <HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>`
`56`	`56`	`<Private>True</Private>`
`57`	`57`	`</Reference>`
`58`	`58`	`</ItemGroup>`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit44ef814

File tree

3 files changed

3 files changed

`‎src/fsharp/FSharp.Core/reflect.fs‎`

`‎tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj‎`

0 commit comments