Commit7a8aa63

authored and

committed

Changes to make the build work with Mono 4.9+ (#2707)

Mono changedLooks like the problem is due to this commit toMonomono/mono@efd53c8Mono's internal System.Reflection.Emit.MonoGenericClass was renamedto System.Reflection.Emit.TypeBuilderInstantiationThat broke the workaround inhttps://github.com/fsharp/fsharp/blob/5a942daf930d7023c78f578ec6876b86a6f13f1e/src/absil/ilreflect.fs#L619-L623 .

1 parent91da9db commit7a8aa63Copy full SHA for 7a8aa63

File tree

-6

lines changed

-6

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -616,16 +616,18 @@ let convFieldInit x =`
`616`	`616`	`// it isn't we resort to this technique...`
`617`	`617`	`letTypeBuilderInstantiationT=`
`618`	`618`	`letty=`
	`619`	`+ Type.GetType("System.Reflection.Emit.TypeBuilderInstantiation")`
`619`	`620`	`#if ENABLE_MONO_SUPPORT`
`620`		`-if runningOnMonothen`
	`621`	`+letty=`
	`622`	`+if runningOnMono&&(isNull ty)then`
`621`	`623`	`Type.GetType("System.Reflection.MonoGenericClass")`
`622`	`624`	`else`
	`625`	`+ ty`
`623`	`626`	`#endif`
`624`		`- Type.GetType("System.Reflection.Emit.TypeBuilderInstantiation")`
`625`	`627`	`assert(not(isNull ty))`
`626`	`628`	`ty`
`627`	`629`
`628`		`-lettypeIsNotQueryable(typ:Type)=`
	`630`	`+lettypeIsNotQueryable(typ:Type)=`
`629`	`631`	`#if FX_RESHAPED_REFLECTION`
`630`	`632`	`lettyp= typ.GetTypeInfo()`
`631`	`633`	`#endif`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`2`		`-`
`3`	`2`	`letPrintErr(filename,line,msg)=`
`4`	`3`	`printfn"%s(%d): error :%s" filename line msg`
`5`	`4`
`@@ -9,7 +8,7 @@ let Err(filename, line, msg) =`
`9`	`8`	`printfn"# comment"`
`10`	`9`	`printfn"ident,\"string\""`
`11`	`10`	`printfn"errNum,ident,\"string\""`
`12`		`-failwithf"there were errors in the file '%s'" filename`
	`11`	`+failwith(sprintf"there were errors in the file '%s'" filename)`
`13`	`12`
`14`	`13`	`letxmlBoilerPlateString=@"<?xml version=""1.0"" encoding=""utf-8""?>`
`15`	`14`	`<root>`
`@@ -470,4 +469,4 @@ let Main args =`
`470`	`469`	`1`
`471`	`470`
`472`	`471`	`printfn"fssrgen: args =%A" fsi.CommandLineArgs`
`473`		`-Main fsi.CommandLineArgs`
	`472`	`+Main fsi.CommandLineArgs`

Comments

(0)