From fbd87e90810286f66b7284cdf2763c17d1f17ed7 Mon Sep 17 00:00:00 2001 From: Pierre Chambart Date: Fri, 15 Jan 2016 16:07:59 +0100 Subject: [PATCH 1/2] Const_float_array are constant for branch merging --- bytecomp/lambda.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bytecomp/lambda.ml b/bytecomp/lambda.ml index 1a9678286..cb4227fd5 100644 --- a/bytecomp/lambda.ml +++ b/bytecomp/lambda.ml @@ -274,7 +274,7 @@ let make_key e = try Ident.find_same id env with Not_found -> e end - | Lconst (Const_base (Const_string _)|Const_float_array _) -> + | Lconst (Const_base (Const_string _)) -> (* Mutable constants are not shared *) raise Not_simple | Lconst _ -> e From b36f05bb34ed4f83e21e0a51f201c9f99522cd43 Mon Sep 17 00:00:00 2001 From: Mark Shinwell Date: Mon, 18 Jan 2016 08:34:33 +0000 Subject: [PATCH 2/2] Changes entry for GPR#431 --- Changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes b/Changes index 6c65dcb67..4a9d4d376 100644 --- a/Changes +++ b/Changes @@ -138,6 +138,8 @@ Compilers: (Leo White) - PR#6920: fix debug informations around uses of %apply or %revapply (Jérémie Dimino) +- GPR#431: permit constant float arrays to be eligible for pattern match + branch merging (Pierre Chambart) Runtime system: - PR#3612: allow allocating custom block with finalizers in the minor heap