Skip to content

This takes Steffens repro and has a slightly different fix -- Fixes I1556 #1545

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
KevinRansom merged 7 commits into from
Sep 20, 2016
Merged

This takes Steffens repro and has a slightly different fix -- Fixes I1556 #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b62f97c
Try to reproduce #1536
forki Sep 15, 2016
6bbea65
Limit number of scopes in a method to avoid Stack Overflow in PDBWrit…
forki Sep 15, 2016
ab11350
Merge branch 'i1536' of https://github.com/forki/visualfsharp into fo…
KevinRansom Sep 17, 2016
b528c23
Merge pdb scopes for full pdbs when the scopes are the same size.
KevinRansom Sep 17, 2016
9eea25c
Merge https://github.com/Microsoft/visualfsharp into forki-i1536
KevinRansom Sep 17, 2016
c7a9acf
reapply top
KevinRansom Sep 18, 2016
9dc2ed8
A couple of files had variables change order
KevinRansom Sep 18, 2016
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
29 changes: 17 additions & 12 deletions src/absil/ilwritepdb.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ let writePdbInfo fixupOverlappingSequencePoints showTimes f fpdb info cvChunk =
match Map.tryFind k res with
| Some xsR -> xsR := sp :: !xsR; res
| None -> Map.add k (ref [sp]) res

let res = Array.fold add res sps
let res = Map.toList res // ordering may not be stable
List.map (fun (_,x) -> Array.ofList !x) res
Expand All @@ -502,22 +502,27 @@ let writePdbInfo fixupOverlappingSequencePoints showTimes f fpdb info cvChunk =
if spset.Length > 0 then
Array.sortInPlaceWith SequencePoint.orderByOffset spset
let sps =
spset |> Array.map (fun sp ->
// Ildiag.dprintf "token 0x%08lx has an sp at offset 0x%08x\n" minfo.MethToken sp.Offset
(sp.Offset, sp.Line, sp.Column,sp.EndLine, sp.EndColumn))
// Use of alloca in implementation of pdbDefineSequencePoints can give stack overflow here
spset |> Array.map (fun sp ->
// Ildiag.dprintf "token 0x%08lx has an sp at offset 0x%08x\n" minfo.MethToken sp.Offset
(sp.Offset, sp.Line, sp.Column,sp.EndLine, sp.EndColumn))
// Use of alloca in implementation of pdbDefineSequencePoints can give stack overflow here
if sps.Length < 5000 then
pdbDefineSequencePoints !pdbw (getDocument spset.[0].Document) sps)
pdbDefineSequencePoints !pdbw (getDocument spset.[0].Document) sps)

// Write the scopes
let rec writePdbScope top sco =
if top || sco.Locals.Length <> 0 || sco.Children.Length <> 0 then
pdbOpenScope !pdbw sco.StartOffset
let rec writePdbScope parent sco =
if parent = None || sco.Locals.Length <> 0 || sco.Children.Length <> 0 then
// Only nest scopes if the child scope is a different size from
let nested =
match parent with
| Some p -> sco.StartOffset <> p.StartOffset || sco.EndOffset <> p.EndOffset
| None -> true
if nested then pdbOpenScope !pdbw sco.StartOffset
sco.Locals |> Array.iter (fun v -> pdbDefineLocalVariable !pdbw v.Name v.Signature v.Index)
sco.Children |> Array.iter (writePdbScope false)
pdbCloseScope !pdbw sco.EndOffset
writePdbScope true minfo.RootScope
sco.Children |> Array.iter (writePdbScope (if nested then Some sco else parent))
if nested then pdbCloseScope !pdbw sco.EndOffset

writePdbScope None minfo.RootScope
pdbCloseMethod !pdbw
end)
reportTime showTimes "PDB: Wrote methods"
Expand Down
10 changes: 4 additions & 6 deletions tests/fsharpqa/Source/CodeGen/EmittedIL/SerializableAttribute/ToplevelModule.il.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1720,21 +1720,19 @@
{
// Code size 14 (0xe)
.maxstack 3
.locals init ([0] string V_0,
[1] string greeting)
.line 12,12 : 9,31
.locals init ([0] string greeting,
[1] string V_1)
.line 12,12 : 9,31 ''
IL_0000: nop
IL_0001: call string ABC::get_greeting()
IL_0006: stloc.0
.line 22,22 : 13,35
.line 22,22 : 13,35 ''
IL_0007: call string ABC/ABC::get_greeting()
IL_000c: stloc.1
IL_000d: ret
} // end of method $ABC::.cctor

} // end of class '<StartupCode$TopLevelModule>'.$ABC


// =============================================================

// *********** DISASSEMBLY COMPLETE ***********************
9 changes: 4 additions & 5 deletions tests/fsharpqa/Source/CodeGen/EmittedIL/SerializableAttribute/ToplevelModuleP.il.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1692,18 +1692,17 @@
{
// Code size 14 (0xe)
.maxstack 3
.locals init ([0] string V_0,
[1] string greeting)
.line 12,12 : 9,31
.locals init ([0] string greeting,
[1] string V_1)
.line 12,12 : 9,31 ''
IL_0000: nop
IL_0001: call string ABC::get_greeting()
IL_0006: stloc.0
.line 22,22 : 13,35
.line 22,22 : 13,35 ''
IL_0007: call string ABC/ABC::get_greeting()
IL_000c: stloc.1
IL_000d: ret
} // end of method $ABC::.cctor

} // end of class '<StartupCode$ToplevelModuleP>'.$ABC


Expand Down
9 changes: 4 additions & 5 deletions tests/fsharpqa/Source/CodeGen/EmittedIL/SerializableAttribute/ToplevelNamespace.il.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2513,18 +2513,17 @@
{
// Code size 14 (0xe)
.maxstack 3
.locals init ([0] string V_0,
[1] string greeting)
.line 19,19 : 9,31
.locals init ([0] string greeting,
[1] string V_1)
.line 19,19 : 9,31 ''
IL_0000: nop
IL_0001: call string XYZ.ABC::get_greeting()
IL_0006: stloc.0
.line 29,29 : 13,35
.line 29,29 : 13,35 ''
IL_0007: call string XYZ.ABC/ABC::get_greeting()
IL_000c: stloc.1
IL_000d: ret
} // end of method $ToplevelNamespace::.cctor

} // end of class '<StartupCode$ToplevelNamespace>'.$ToplevelNamespace


Expand Down
9 changes: 4 additions & 5 deletions tests/fsharpqa/Source/CodeGen/EmittedIL/SerializableAttribute/ToplevelNamespaceP.il.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2471,18 +2471,17 @@
{
// Code size 14 (0xe)
.maxstack 3
.locals init ([0] string V_0,
[1] string greeting)
.line 19,19 : 9,31
.locals init ([0] string greeting,
[1] string V_1)
.line 19,19 : 9,31 ''
IL_0000: nop
IL_0001: call string XYZ.ABC::get_greeting()
IL_0006: stloc.0
.line 29,29 : 13,35
.line 29,29 : 13,35 ''
IL_0007: call string XYZ.ABC/ABC::get_greeting()
IL_000c: stloc.1
IL_000d: ret
} // end of method $ToplevelNamespace::.cctor

} // end of class '<StartupCode$ToplevelNamespaceP>'.$ToplevelNamespace


Expand Down
Loading