Skip to content

Fix for issue #517 #518

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

Merged
dsyme merged 4 commits into from
May 22, 2026
Merged

Fix for issue #517 #518

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
9270506
Red test for try/finally unit issue.
rspeele May 16, 2026
9caf38c
Fix for unit-in-try bug.
rspeele May 17, 2026
d71e2a2
Red test for enum equality comparison.
rspeele May 17, 2026
53720b9
Fix for enum comparisons generation.
rspeele May 17, 2026
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
11 changes: 10 additions & 1 deletion src/ProvidedTypes.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14641,6 +14641,7 @@ namespace ProviderImplementation.ProvidedTypes
| LessThan(None, [t1], [a1; a2]) ->
emitExpr ExpectedStackState.Value a1
emitExpr ExpectedStackState.Value a2
let t1 = if t1.IsEnum then t1.GetEnumUnderlyingType() else t1
match t1 with
| Bool | SByte | Char
| Double | Single
Expand All @@ -14659,6 +14660,7 @@ namespace ProviderImplementation.ProvidedTypes
| GreaterThan(None, [t1], [a1; a2]) ->
emitExpr ExpectedStackState.Value a1
emitExpr ExpectedStackState.Value a2
let t1 = if t1.IsEnum then t1.GetEnumUnderlyingType() else t1
match t1 with
| Bool | SByte | Char
| Double | Single
Expand All @@ -14677,6 +14679,7 @@ namespace ProviderImplementation.ProvidedTypes
| LessThanOrEqual(None, [t1], [a1; a2]) ->
emitExpr ExpectedStackState.Value a1
emitExpr ExpectedStackState.Value a2
let t1 = if t1.IsEnum then t1.GetEnumUnderlyingType() else t1
match t1 with
| Bool | SByte | Char
| Int16 | Int32 | Int64 ->
Expand All @@ -14703,6 +14706,7 @@ namespace ProviderImplementation.ProvidedTypes
| GreaterThanOrEqual(None, [t1], [a1; a2]) ->
emitExpr ExpectedStackState.Value a1
emitExpr ExpectedStackState.Value a2
let t1 = if t1.IsEnum then t1.GetEnumUnderlyingType() else t1
match t1 with
| Bool | SByte | Char
| Int16 | Int32 | Int64 ->
Expand All @@ -14728,6 +14732,7 @@ namespace ProviderImplementation.ProvidedTypes
| Equals(None, [t1], [a1; a2]) ->
emitExpr ExpectedStackState.Value a1
emitExpr ExpectedStackState.Value a2
let t1 = if t1.IsEnum then t1.GetEnumUnderlyingType() else t1
match t1 with
| Bool | SByte | Char
| Double | Single
Expand All @@ -14743,6 +14748,7 @@ namespace ProviderImplementation.ProvidedTypes
| NotEquals(None, [t1], [a1; a2]) ->
emitExpr ExpectedStackState.Value a1
emitExpr ExpectedStackState.Value a2
let t1 = if t1.IsEnum then t1.GetEnumUnderlyingType() else t1
match t1 with
| Bool | SByte | Char
| Double | Single
Expand Down Expand Up @@ -16046,9 +16052,12 @@ namespace ProviderImplementation.ProvidedTypes

let methLocals = Dictionary<Var, ILLocalBuilder>()

let expectedState = if (transType minfo.ReturnType = ILType.Void) then ExpectedStackState.Empty else ExpectedStackState.Value
let retType = transType minfo.ReturnType
let retUnit = retType = ILType.Void || retType.QualifiedName = (transType (convTypeToTgt typeof<unit>)).QualifiedName
let expectedState = if retUnit then ExpectedStackState.Empty else ExpectedStackState.Value
let codeGen = CodeGenerator(assemblyMainModule, genUniqueTypeName, implicitCtorArgsAsFields, convTypeToTgt, transType, transFieldSpec, transMeth, transMethRef, transCtorSpec, ilg, methLocals, parameterVars)
codeGen.EmitExpr (expectedState, expr)
if retUnit then ilg.Emit(I_ldnull)
ilg.Emit I_ret
| _ -> ()

Expand Down
10 changes: 9 additions & 1 deletion tests/GeneratedCodeTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,12 @@ let ``typeof``() =
<@
typeof<DateTime>.Name
@> "DateTime"
]
]

[<Fact>]
let ``try-finally with a unit-returning method``() =
testProvidedAssembly
[
(<@@ try ResizeArray<int>().Clear() finally ResizeArray<int>().Clear() @@>),
(fun _ -> ()) // just checking for InvalidProgramException
]
12 changes: 12 additions & 0 deletions tests/GeneratedOpTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,3 +1121,15 @@ let ``bitwise not execute correctly``() =
checkExpr <@ ~~~1234us @>
checkExpr <@ ~~~12uy @>
]

[<Fact>]
let ``equality on enums``() =
testProvidedAssembly
[
check <@ DateTimeKind.Utc = DateTimeKind.Local @> false
check <@ DateTimeKind.Utc <> DateTimeKind.Local @> true
check <@ DateTimeKind.Utc < DateTimeKind.Local @> true
check <@ DateTimeKind.Utc <= DateTimeKind.Local @> true
check <@ DateTimeKind.Utc > DateTimeKind.Local @> false
check <@ DateTimeKind.Utc >= DateTimeKind.Local @> false
]
Loading