Commit2f76f88

committed

Fold in fix for Mono that got lost in 2.0 --> 3.0 transition

This fixes the fsharpi issue reported yesterday. The fix was in the 2.0codebase but seems to have got lost along the wayfsharp#39

1 parentf36ff15 commit2f76f88Copy full SHA for 2f76f88

File tree

-1

lines changed

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,14 @@ let rec convAttribElem cenv emEnv = function`
`668`	`668`	`// This is gross. TypeBuilderInstantiation should really be a public type, since we`
`669`	`669`	`// have to use alternative means for various Method/Field/Constructor lookups. However since`
`670`	`670`	`// it isn't we resort to this technique...`
`671`		`-letTypeBuilderInstantiationT= Type.GetType("System.Reflection.Emit.TypeBuilderInstantiation")`
	`671`	`+letTypeBuilderInstantiationT=`
	`672`	`+letty=`
	`673`	`+if runningOnMonothen`
	`674`	`+ Type.GetType("System.Reflection.MonoGenericClass")`
	`675`	`+else`
	`676`	`+ Type.GetType("System.Reflection.Emit.TypeBuilderInstantiation")`
	`677`	`+assert(not(isNull ty))`
	`678`	`+ ty`
`672`	`679`
`673`	`680`	`lettypeIsNotQueryable(typ:Type)=`
`674`	`681`	`(typ:? TypeBuilder)\|\|((typ.GetType()).Equals(TypeBuilderInstantiationT))`

Comments

(0)