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

Jump to bottom

vm: rework the exception handling #1061

Merged
merged 13 commits into from
Feb 5, 2024
Merged

vm: rework the exception handling #1061

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0fa6d3b
vm: rework the exception handling
zerbina Dec 21, 2023
453140c
Merge branch 'devel' into vm-rework-exception-handling
zerbina Feb 2, 2024
d632598
vm: fix illegal ref-counter increment
zerbina Feb 2, 2024
c817ca0
vm: resume unwinding on `FinallyEnd`
zerbina Feb 2, 2024
3b8c28a
tests: remove `knownIssue` marker from some tests
zerbina Feb 2, 2024
812bb09
vmgen: fix wrong `SetEh` patching
zerbina Feb 2, 2024
d33acc5
tests: add tests for the fixed issues
zerbina Feb 4, 2024
6e9f7ec
tests: add a test for the "reraise-and-handle-in-finally" case
zerbina Feb 4, 2024
5830868
Merge branch 'devel' into vm-rework-exception-handling
zerbina Feb 4, 2024
8d68357
post-merge fix-up
zerbina Feb 4, 2024
1b51e92
fix multiple typos in comments
zerbina Feb 4, 2024
960185a
tests: add extra assertion
zerbina Feb 4, 2024
7a0a245
tests: update the `thandle_in_finally` test
zerbina Feb 5, 2024
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
9 changes: 9 additions & 0 deletions compiler/vm/packed_env.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ type

code*: seq[TInstr]
debug*: seq[uint32] # Packed version of `TCtx.debug`. Indices into `infos`
ehTable*: seq[HandlerTableEntry]
ehCode*: seq[EhInstr]

# rtti related data:
nimNodes: seq[PackedNodeLite]
Expand Down Expand Up @@ -928,6 +930,9 @@ func storeEnv*(enc: var PackedEncoder, dst: var PackedEnv, c: TCtx) =
mapList(dst.debug, c.debug, d):
dst.infos.getOrIncl(d).uint32

dst.ehTable = c.ehTable
dst.ehCode = c.ehCode

mapList(dst.files, c.config.m.fileInfos, fi):
fi.fullPath.string

Expand Down Expand Up @@ -960,6 +965,8 @@ proc writeToFile*(p: PackedEnv, file: AbsoluteFile): RodFileError =
f.storePrim p.entryPoint
f.storeSeq p.code
f.storeSeq p.debug
f.storeSeq p.ehTable
f.storeSeq p.ehCode

f.storeSection symsSection
f.store p.infos
Expand Down Expand Up @@ -1002,6 +1009,8 @@ proc readFromFile*(p: var PackedEnv, file: AbsoluteFile): RodFileError =
f.loadPrim p.entryPoint
f.loadSeq p.code
f.loadSeq p.debug
f.loadSeq p.ehTable
f.loadSeq p.ehCode

f.loadSection symsSection
f.load p.infos
Expand Down
Loading
Loading