jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #3546

Browse source
This commit is contained in:
Araq 2015-11-18 14:42:13 +01:00
commit 1757b8466d
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/vm.nim
View file

@ -255,9 +255,12 @@ proc cleanUpOnException(c: PCtx; tos: PStackFrame):
nextExceptOrFinally = pc2 + c.code[pc2].regBx - wordExcess nextExceptOrFinally = pc2 + c.code[pc2].regBx - wordExcess
inc pc2 inc pc2
while c.code[pc2].opcode == opcExcept: while c.code[pc2].opcode == opcExcept:
let exceptType = c.types[c.code[pc2].regBx-wordExcess].skipTypes( let excIndex = c.code[pc2].regBx-wordExcess
let exceptType = if excIndex > 0: c.types[excIndex].skipTypes(
abstractPtrs) abstractPtrs)
if inheritanceDiff(exceptType, raisedType) <= 0: else: nil
#echo typeToString(exceptType), " ", typeToString(raisedType)
if exceptType.isNil or inheritanceDiff(exceptType, raisedType) <= 0:
# mark exception as handled but keep it in B for # mark exception as handled but keep it in B for
# the getCurrentException() builtin: # the getCurrentException() builtin:
c.currentExceptionB = c.currentExceptionA c.currentExceptionB = c.currentExceptionA