Skip to content
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

Fix debug tailcalls for pipelines if /tailcalls+ is explicitly specified #12430

Merged
merged 2 commits into from
Nov 22, 2021
Merged

Fix debug tailcalls for pipelines if /tailcalls+ is explicitly specified #12430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7dc850
don't suppress tailcalls in pipeline debugging if tailcalls are on
dsyme Nov 19, 2021
fcc66b2
don't suppress tailcalls in pipeline debugging if tailcalls are on
dsyme Nov 19, 2021
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
39 changes: 24 additions & 15 deletions src/fsharp/IlxGen.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2941,26 +2941,35 @@ and GenLinearExpr cenv cgbuf eenv sp expr sequel preSteps (contf: FakeUnit -> Fa
// Compiler generated sequential executions result in suppressions of debug points on both
// left and right of the sequence
let spStmt, spExpr =
(match spSeq with
| DebugPointAtSequential.SuppressNeither -> SPAlways, SPAlways
| DebugPointAtSequential.SuppressStmt -> SPSuppress, sp
| DebugPointAtSequential.SuppressExpr -> sp, SPSuppress
| DebugPointAtSequential.SuppressBoth -> SPSuppress, SPSuppress)
match spSeq with
| DebugPointAtSequential.SuppressNeither -> SPAlways, SPAlways
| DebugPointAtSequential.SuppressStmt -> SPSuppress, sp
| DebugPointAtSequential.SuppressExpr -> sp, SPSuppress
| DebugPointAtSequential.SuppressBoth -> SPSuppress, SPSuppress

match specialSeqFlag with
| NormalSeq ->
GenExpr cenv cgbuf eenv spStmt e1 discard
GenLinearExpr cenv cgbuf eenv spExpr e2 sequel true contf
| ThenDoSeq ->
let g = cenv.g
let isUnit = isUnitTy g (tyOfExpr g e1)
if isUnit then
GenExpr cenv cgbuf eenv spExpr e1 discard
GenExpr cenv cgbuf eenv spStmt e2 discard
GenUnitThenSequel cenv eenv e2.Range eenv.cloc cgbuf sequel
else
GenExpr cenv cgbuf eenv spExpr e1 Continue
GenExpr cenv cgbuf eenv spStmt e2 discard
GenSequel cenv eenv.cloc cgbuf sequel
// "e then ()" with DebugPointAtSequential.SuppressStmt is used
// in mkDebugPoint to emit a debug point on "e". However we don't want this to interfere
// with tailcalls, so detect this case and throw the "then ()" away, having already
// worked out "spExpr" up above.
match e2 with
| Expr.Const (Const.Unit, _, _) ->
GenExpr cenv cgbuf eenv spExpr e1 sequel
| _ ->
let g = cenv.g
let isUnit = isUnitTy g (tyOfExpr g e1)
if isUnit then
GenExpr cenv cgbuf eenv spExpr e1 discard
GenExpr cenv cgbuf eenv spStmt e2 discard
GenUnitThenSequel cenv eenv e2.Range eenv.cloc cgbuf sequel
else
GenExpr cenv cgbuf eenv spExpr e1 Continue
GenExpr cenv cgbuf eenv spStmt e2 discard
GenSequel cenv eenv.cloc cgbuf sequel
contf Fake

| Expr.Let (bind, body, _, _) ->
Expand Down
13 changes: 7 additions & 6 deletions tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
.assembly extern FSharp.Core
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
.ver 5:0:0:0
.ver 6:0:0:0
}
.assembly TestFunction15
{
Expand All @@ -36,13 +36,13 @@
// Offset: 0x000001F0 Length: 0x00000072
}
.module TestFunction15.exe
// MVID: {611B0ED4-A624-4662-A745-0383D40E1B61}
// MVID: {6197D1F9-A624-4662-A745-0383F9D19761}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x07120000
// Image base: 0x06AD0000


// =============== CLASS MEMBERS DECLARATION ===================
Expand Down Expand Up @@ -95,7 +95,7 @@
.method public static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<int32>
TestFunction15(int32 inp) cil managed
{
// Code size 40 (0x28)
// Code size 42 (0x2a)
.maxstack 6
.locals init ([0] int32 x,
[1] class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<int32> 'Pipe #1 input at line 6')
Expand All @@ -119,9 +119,10 @@
.line 6,6 : 16,41 ''
IL_001c: ldsfld class TestFunction15/TestFunction15@6 TestFunction15/TestFunction15@6::@_instance
IL_0021: ldloc.1
IL_0022: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<!!1> [FSharp.Core]Microsoft.FSharp.Collections.ListModule::Map<int32,int32>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<!!0,!!1>,
IL_0022: tail.
IL_0024: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<!!1> [FSharp.Core]Microsoft.FSharp.Collections.ListModule::Map<int32,int32>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<!!0,!!1>,
class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1<!!0>)
IL_0027: ret
IL_0029: ret
} // end of method TestFunction15::TestFunction15

} // end of class TestFunction15
Expand Down