summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changes2
-rw-r--r--asmcomp/selectgen.ml2
2 files changed, 4 insertions, 0 deletions
diff --git a/Changes b/Changes
index bc1a85dad..b50aaefa5 100644
--- a/Changes
+++ b/Changes
@@ -41,6 +41,8 @@ Bug fixes:
- PR#6109: Typos in ocamlbuild error messages
- PR#6116: more efficient implementation of Digest.to_hex (patch by ygrek)
- PR#6174: OCaml compiler loops on an example using GADTs (-rectypes case)
+- PR#6239: sometimes wrong stack alignment when raising exceptions
+ in -g mode with backtraces active
Standard library:
- PR#4986: add List.sort_uniq and Set.of_list
diff --git a/asmcomp/selectgen.ml b/asmcomp/selectgen.ml
index 8f1277a17..7c52f524d 100644
--- a/asmcomp/selectgen.ml
+++ b/asmcomp/selectgen.ml
@@ -433,6 +433,8 @@ method emit_expr env exp =
Some(self#emit_tuple ext_env simple_list)
end
| Cop(Craise (k, dbg), [arg]) ->
+ if !Clflags.debug && k <> Lambda.Raise_notrace then
+ Proc.contains_calls := true; (* PR#6239 *)
begin match self#emit_expr env arg with
None -> None
| Some r1 ->