From 249f42f05455fb71bd0b5e4acee445991a988699 Mon Sep 17 00:00:00 2001
From: "J.C. Moyer" <jcmoyer32@gmail.com>
Date: Sun, 21 May 2023 16:42:48 -0400
Subject: [PATCH 1/2] Add test for #2466

---
 tests/issues/run.bat              |  1 +
 tests/issues/run.sh               |  1 +
 tests/issues/test_issue_2466.odin | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 tests/issues/test_issue_2466.odin

diff --git a/tests/issues/run.bat b/tests/issues/run.bat
index 87492bc29..bf49bc85b 100644
--- a/tests/issues/run.bat
+++ b/tests/issues/run.bat
@@ -12,6 +12,7 @@ set COMMON=-collection:tests=..\..
 ..\..\..\odin test ..\test_issue_2056.odin %COMMON% -file || exit /b
 ..\..\..\odin test ..\test_issue_2087.odin %COMMON% -file || exit /b
 ..\..\..\odin build ..\test_issue_2113.odin %COMMON% -file -debug || exit /b
+..\..\..\odin test ..\test_issue_2466.odin %COMMON% -file || exit /b
 
 @echo off
 
diff --git a/tests/issues/run.sh b/tests/issues/run.sh
index f894f2dae..bbcd6fb28 100755
--- a/tests/issues/run.sh
+++ b/tests/issues/run.sh
@@ -13,6 +13,7 @@ $ODIN test ../test_issue_1592.odin $COMMON -file
 $ODIN test ../test_issue_2056.odin $COMMON -file
 $ODIN test ../test_issue_2087.odin $COMMON -file
 $ODIN build ../test_issue_2113.odin $COMMON -file -debug
+$ODIN test ../test_issue_2466.odin $COMMON -file
 
 set +x
 
diff --git a/tests/issues/test_issue_2466.odin b/tests/issues/test_issue_2466.odin
new file mode 100644
index 000000000..4810cfea9
--- /dev/null
+++ b/tests/issues/test_issue_2466.odin
@@ -0,0 +1,22 @@
+// Tests issue #2466 https://github.com/odin-lang/Odin/issues/2466
+package test_issues
+
+import "core:fmt"
+import "core:testing"
+
+Bug :: struct  {
+	val: int,
+	arr: []int,
+}
+
+@test
+test_compound_literal_local_reuse :: proc(t: ^testing.T) {
+	v: int = 123
+	bug := Bug {
+		val = v,
+		arr = {42},
+	}
+	testing.expect(t, bug.val == 123, fmt.tprintf("expected 123, found %d", bug.val))
+	testing.expect(t, bug.arr[0] == 42, fmt.tprintf("expected 42, found %d", bug.arr[0]))
+}
+

From 4d5a442d1f7d896e6628b68c0f03b07fa5239475 Mon Sep 17 00:00:00 2001
From: "J.C. Moyer" <jcmoyer32@gmail.com>
Date: Sun, 21 May 2023 16:43:34 -0400
Subject: [PATCH 2/2] Use compound literal storage for ValueDecl lvals

Prior to this commit, if a variable was initialized using a compound
literal, its associated storage would not be set. This commit makes the
variable always take on the storage of the compound literal.

Fixes #2466
---
 src/llvm_backend_stmt.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/llvm_backend_stmt.cpp b/src/llvm_backend_stmt.cpp
index 125913ac5..0d6f8a136 100644
--- a/src/llvm_backend_stmt.cpp
+++ b/src/llvm_backend_stmt.cpp
@@ -2303,6 +2303,7 @@ gb_internal void lb_build_stmt(lbProcedure *p, Ast *node) {
 							lb_add_entity(p->module, e, val);
 							lb_add_debug_local_variable(p, val.value, e->type, e->token);
 							lvals_preused[lval_index] = true;
+							lvals[lval_index] = *comp_lit_addr;
 						}
 					}
 				}