From 5c7853439e54157ab08a210c20522a4cf8390c30 Mon Sep 17 00:00:00 2001
From: Michael Ferguson <mppf@users.noreply.github.com>
Date: Fri, 6 Sep 2024 15:40:31 -0400
Subject: [PATCH] Add test to check for unnecessary allocation

---
Signed-off-by: Michael Ferguson <mppf@users.noreply.github.com>
---
 .../post-alloc-dists.prediff                     |  4 ++--
 .../post-alloc.prediff                           |  4 ++--
 .../return-array-declared-type.chpl              | 16 ++++++++++++++++
 .../return-array-declared-type.compopts          |  1 +
 .../return-array-declared-type.good              |  4 ++++
 .../return-array-declared-type.prediff           |  6 ++++++
 6 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.chpl
 create mode 100644 test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.compopts
 create mode 100644 test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.good
 create mode 100755 test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.prediff

diff --git a/test/arrays/ferguson/array-initialization-patterns/post-alloc-dists.prediff b/test/arrays/ferguson/array-initialization-patterns/post-alloc-dists.prediff
index 7cdfa465562c..77c68793a041 100755
--- a/test/arrays/ferguson/array-initialization-patterns/post-alloc-dists.prediff
+++ b/test/arrays/ferguson/array-initialization-patterns/post-alloc-dists.prediff
@@ -1,6 +1,6 @@
 #!/bin/bash
 # show only lines containing "alloc int"
-# show only lines after "alloc test begins"
-# show only lines before "alloc test begins"
+# show only lines after "alloc int test begins"
+# show only lines before "alloc int test ends"
 cat $2 | grep "alloc int" | grep -A 1000 "alloc int test begins" | grep -B 1000 "alloc int test ends" > $2.tmp
 mv $2.tmp $2
diff --git a/test/arrays/ferguson/array-initialization-patterns/post-alloc.prediff b/test/arrays/ferguson/array-initialization-patterns/post-alloc.prediff
index 0c1c9deb3078..141caad31263 100755
--- a/test/arrays/ferguson/array-initialization-patterns/post-alloc.prediff
+++ b/test/arrays/ferguson/array-initialization-patterns/post-alloc.prediff
@@ -1,6 +1,6 @@
 #!/bin/bash
 # show only lines containing 'alloc int'
-# show only lines after "alloc test begins"
-# show only lines before "alloc test begins"
+# show only lines after "alloc int test begins"
+# show only lines before "alloc int test ends"
 cat $2 | grep "alloc int" | grep -A 1000 "alloc int test begins" | grep -B 1000 "alloc int test ends" > $2.tmp
 mv $2.tmp $2
diff --git a/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.chpl b/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.chpl
new file mode 100644
index 000000000000..186e217d6de7
--- /dev/null
+++ b/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.chpl
@@ -0,0 +1,16 @@
+// this test is intended as a reproducer for the
+// problem of too much memory allocated
+// shown in issue #25741
+
+config const n = 100_000;
+
+proc myfn(nn: int) : [0..<nn] int {
+  var ret: [0..<nn] int;
+  return ret;
+}
+
+proc main() {
+  writeln("alloc int test begins");
+  var x = myfn(n);
+  writeln("alloc int test ends");
+}
diff --git a/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.compopts b/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.compopts
new file mode 100644
index 000000000000..95acda1e1589
--- /dev/null
+++ b/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.compopts
@@ -0,0 +1 @@
+--set debugDefaultDist=true
diff --git a/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.good b/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.good
new file mode 100644
index 000000000000..9b2db67b7c3b
--- /dev/null
+++ b/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.good
@@ -0,0 +1,4 @@
+alloc int test begins
+*** DR alloc int(64) 100000
+*** DR calling postalloc int(64) 100000
+alloc int test ends
diff --git a/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.prediff b/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.prediff
new file mode 100755
index 000000000000..141caad31263
--- /dev/null
+++ b/test/arrays/ferguson/array-initialization-patterns/return-array-declared-type.prediff
@@ -0,0 +1,6 @@
+#!/bin/bash
+# show only lines containing 'alloc int'
+# show only lines after "alloc int test begins"
+# show only lines before "alloc int test ends"
+cat $2 | grep "alloc int" | grep -A 1000 "alloc int test begins" | grep -B 1000 "alloc int test ends" > $2.tmp
+mv $2.tmp $2