Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PowerPC, System Z: do not reset backtrace_pos in caml_raise_exception (#9428) 

* PowerPC, System Z: do not reset backtrace_pos in caml_raise_exception
* Add Changes entry
master
Xavier Leroy 2020-04-07 15:47:55 +02:00 committed by GitHub
parent 2e82c0e843
commit d235f167fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changes
View File

@ -313,6 +313,11 @@ Working version
- #9367: Make bytecode and native-code backtraces agree.
(Stephen Dolan, review by Gabriel Scherer)
- #9428: Fix truncated exception backtrace for C->OCaml callbacks
on Power and Z System
(Xavier Leroy, review by Nicolás Ojeda Bär)
OCaml 4.10 maintenance branch
-----------------------------

2
runtime/power.S
View File

@ -410,8 +410,6 @@ FUNCTION(caml_raise_exception)
/* Branch to handler */
bctr
.L121:
li 0, 0
stg 0, Caml_state(backtrace_pos)
mr 27, 3 /* preserve exn bucket in callee-save reg */
/* arg1: exception bucket, already in r3 */
lg 4, Caml_state(last_return_address) /* arg2: PC of raise */

2
runtime/s390x.S
View File

@ -183,8 +183,6 @@ caml_raise_exception:
/* Branch to handler */
br %r1;
.L112:
lgfi %r0, 0
stg %r0, Caml_state(backtrace_pos)
ldgr %f15,%r2 /* preserve exn bucket in callee-save reg */
/* arg1: exception bucket, already in r2 */
lg %r3, Caml_state(last_return_address) /* arg2: PC of raise */