Don't apply local function optimisation for Tupled functions (fixes #8705) (#8706)

* Don't apply local function optimisation for Tupled functions

* Add test cases

* Remove wrong hunk

3 files changed, 29 insertions, 0 deletions

diff --git a/testsuite/tests/local-functions/ocamltests b/testsuite/tests/local-functions/ocamltests
new file mode 100644
index 0000000000..65f8036957
--- /dev/null
+++ b/testsuite/tests/local-functions/ocamltests
@@ -0,0 +1,2 @@
+tupled.ml
+tupled2.ml
diff --git a/testsuite/tests/local-functions/tupled.ml b/testsuite/tests/local-functions/tupled.ml
new file mode 100644
index 0000000000..aef5aacb27
--- /dev/null
+++ b/testsuite/tests/local-functions/tupled.ml
@@ -0,0 +1,11 @@
+(* TEST
+*)
+
+(* PR#8705 *)
+let () =
+  let tupled (x, y) =
+    print_string "";
+    fun z -> x, y, z
+  in
+  let a, b, c = tupled (0, 1) 2 in
+  assert (a = 0 && b = 1 && c = 2)
diff --git a/testsuite/tests/local-functions/tupled2.ml b/testsuite/tests/local-functions/tupled2.ml
new file mode 100644
index 0000000000..e1564980d6
--- /dev/null
+++ b/testsuite/tests/local-functions/tupled2.ml
@@ -0,0 +1,16 @@
+(* TEST
+*)
+
+(* PR#8705 *)
+
+let test x =
+  let tupled (x, y) = (); fun () -> [|x; y|] in
+  match x with
+  | None -> [| |]
+  | Some (x, y) -> tupled (x, y) ()
+
+let expected = "Hello "
+
+let result = (test (Some (expected, "World!"))).(0)
+
+let () = assert (String.equal expected result)