Commitcf5afdc

authored

Merge pull requestdotnet#26 from forki/literal-value-bug

Use WithFieldMarshal

2 parentsccd130a +4b131f8 commitcf5afdcCopy full SHA for cf5afdc

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1559,7 +1559,7 @@ type ILFieldDef =`
`1559`	`1559`	`memberx.WithSpecialName(condition)={ xwith Attributes= x.Attributes\|> conditionalAdd condition(FieldAttributes.SpecialName\|\|\| FieldAttributes.RTSpecialName)}`
`1560`	`1560`	`memberx.WithNotSerialized(condition)={ xwith Attributes= x.Attributes\|> conditionalAdd condition FieldAttributes.NotSerialized}`
`1561`	`1561`	`memberx.WithLiteralDefaultValue(literal)={ xwith LiteralValue= literal; Attributes= x.Attributes\|> conditionalAdd literal.IsSome(FieldAttributes.Literal\|\|\| FieldAttributes.HasDefault)}`
`1562`		`-memberx.WithHasFieldMarshal(condition)={ xwith Attributes= x.Attributes\|> conditionalAddcondition FieldAttributes.HasFieldMarshal}`
	`1562`	`+memberx.WithFieldMarshal(marshal)={ xwithMarshal= marshal;Attributes= x.Attributes\|> conditionalAddmarshal.IsSome FieldAttributes.HasFieldMarshal}`
`1563`	`1563`
`1564`	`1564`
`1565`	`1565`	`// Index table by name. Keep a canonical list to make sure field order is not disturbed for binary manipulation.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1139,7 +1139,7 @@ type ILFieldDef =`
`1139`	`1139`	`memberWithSpecialName:bool->ILFieldDef`
`1140`	`1140`	`memberWithNotSerialized:bool->ILFieldDef`
`1141`	`1141`	`memberWithLiteralDefaultValue:ILFieldInit option->ILFieldDef`
`1142`		`-memberWithHasFieldMarshal:bool->ILFieldDef`
	`1142`	`+memberWithFieldMarshal:ILNativeType option->ILFieldDef`
`1143`	`1143`
`1144`	`1144`	`/// Tables of fields. Logically equivalent to a list of fields but`
`1145`	`1145`	`/// the table is kept in a form optimized for looking up fields by`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6350,15 +6350,15 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) =`
`6350`	`6350`	`Data= None`
`6351`	`6351`	`LiteralValue= None`
`6352`	`6352`	`Offset= ilFieldOffset`
`6353`		`- Marshal=ilFieldMarshal`
	`6353`	`+ Marshal=None`
`6354`	`6354`	`CustomAttrs= mkILCustomAttrs(GenAttrs cenv eenv fattribs@ extraAttribs)}`
`6355`	`6355`	`letfdef=`
`6356`	`6356`	`fdef.WithAccess(access)`
`6357`	`6357`	`.WithStatic(isStatic)`
`6358`	`6358`	`.WithSpecialName(ilFieldName="value__"&& tycon.IsEnumTycon)`
`6359`	`6359`	`.WithNotSerialized(ilNotSerialized)`
`6360`	`6360`	`.WithLiteralDefaultValue(literalValue)`
`6361`		`- .WithHasFieldMarshal(ilFieldMarshal.IsSome)`
	`6361`	`+ .WithFieldMarshal(ilFieldMarshal)`
`6362`	`6362`	`yield fdef`
`6363`	`6363`
`6364`	`6364`	`if requiresExtraFieldthen`

Comments

(0)