Merge pull request #11031 from fabbing/fp_exn_handler

With frame-pointers, exception handlers should restore RBP
ocaml · Feb 25, 2022 · 56c9302 · 56c9302
2 parents 849218e + a6369a2
commit 56c9302
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -483,6 +483,11 @@ OCaml 4.14.0
   Gentoo and Alpine).
   (Alex Fan, review by Gabriel Scherer)
 
+- #11031: Exception handlers restore the rbp register when using frame-pointers
+  on amd64.
+  (Fabrice Buoro, with help from Stephen Dolan, Tom Kelly and Mark Shinwell,
+  review by Xavier Leroy)
+
 OCaml 4.13 maintenance branch
 -----------------------------
 

diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
@@ -804,7 +804,10 @@ let emit_instr env fallthrough i =
       done;
       emit_named_text_section env.f.fun_name
   | Lentertrap ->
-      ()
+      if fp then begin
+        let delta = frame_size env - 16 (* retaddr + rbp *) in
+        I.lea (mem64 NONE delta RSP) rbp
+      end;
   | Ladjust_trap_depth { delta_traps; } ->
       (* each trap occupies 16 bytes on the stack *)
       let delta = 16 * delta_traps in