From 7c4e3ca27b0263dff770fc52a451a00a30e5aa9d Mon Sep 17 00:00:00 2001
From: Jemma Issroff <jemmaissroff@gmail.com>
Date: Mon, 23 Oct 2023 10:33:38 -0300
Subject: [PRISM] Fix AssocSplat node

This commit emits the correct instructions for hashes which have
both AssocSplat and Assoc nodes contained within them
---
 prism_compile.c                 | 63 ++++++++++++++++++++++++++++++++++-------
 test/ruby/test_compile_prism.rb |  5 ++--
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/prism_compile.c b/prism_compile.c
index 3e91a17e03..2aa62f645a 100644
--- a/prism_compile.c
+++ b/prism_compile.c
@@ -1003,16 +1003,8 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
       }
       case PM_ASSOC_SPLAT_NODE: {
         pm_assoc_splat_node_t *assoc_splat_node = (pm_assoc_splat_node_t *)node;
-        if (assoc_splat_node->value) {
-            PM_COMPILE(assoc_splat_node->value);
-        }
 
-        // TODO: Not sure this is accurate, look at FLUSH_CHUNK in the compiler
-        if (!popped) {
-            ADD_INSN1(ret, &dummy_line_node, newarraykwsplat, INT2FIX(0));
-        }
-
-        PM_POP_IF_POPPED;
+        PM_COMPILE(assoc_splat_node->value);
         return;
       }
       case PM_BACK_REFERENCE_READ_NODE: {
@@ -1603,14 +1595,63 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
             // all side-effects (like method calls) that are contained within
             // the hash contents.
             pm_hash_node_t *cast = (pm_hash_node_t *) node;
+            // Elements must be non-empty, otherwise it would be static literal
             pm_node_list_t *elements = &cast->elements;
 
+            pm_node_t *cur_node = elements->nodes[0];
+            pm_node_type_t cur_type = PM_NODE_TYPE(cur_node);
+            int elements_of_cur_type = 0;
+            int allocated_hashes = 0;
+
+            if (!PM_NODE_TYPE_P(cur_node, PM_ASSOC_NODE)) {
+                ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+                ADD_INSN1(ret, &dummy_line_node, newhash, INT2FIX(0));
+                allocated_hashes++;
+            }
+
             for (size_t index = 0; index < elements->size; index++) {
-                PM_COMPILE(elements->nodes[index]);
+                pm_node_t *cur_node = elements->nodes[index];
+                if (!popped) {
+                    if (!PM_NODE_TYPE_P(cur_node, cur_type)) {
+                        if (!allocated_hashes) {
+                            ADD_INSN1(ret, &dummy_line_node, newhash, INT2FIX(elements_of_cur_type * 2));
+                        }
+                        else {
+                            if (cur_type == PM_ASSOC_NODE) {
+                                ADD_SEND(ret, &dummy_line_node, id_core_hash_merge_ptr, INT2FIX(3));
+                            }
+                            else {
+                                ADD_SEND(ret, &dummy_line_node, id_core_hash_merge_kwd, INT2FIX(2));
+                            }
+                        }
+
+                        ADD_INSN1(ret, &dummy_line_node, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+                        ADD_INSN(ret, &dummy_line_node, swap);
+                        PM_COMPILE(elements->nodes[index]);
+
+                        allocated_hashes++;
+                        elements_of_cur_type = 0;
+                        cur_type = PM_NODE_TYPE(cur_node);
+                    }
+                    else {
+                        elements_of_cur_type++;
+                        PM_COMPILE(elements->nodes[index]);
+                    }
+                }
             }
 
             if (!popped) {
-                ADD_INSN1(ret, &dummy_line_node, newhash, INT2FIX(elements->size * 2));
+                if (!allocated_hashes) {
+                    ADD_INSN1(ret, &dummy_line_node, newhash, INT2FIX(elements_of_cur_type * 2));
+                }
+                else {
+                    if (cur_type == PM_ASSOC_NODE) {
+                        ADD_SEND(ret, &dummy_line_node, id_core_hash_merge_ptr, INT2FIX(3));
+                    }
+                    else {
+                        ADD_SEND(ret, &dummy_line_node, id_core_hash_merge_kwd, INT2FIX(2));
+                    }
+                }
             }
         }
 
diff --git a/test/ruby/test_compile_prism.rb b/test/ruby/test_compile_prism.rb
index 1e69982148..74efd36ce2 100644
--- a/test/ruby/test_compile_prism.rb
+++ b/test/ruby/test_compile_prism.rb
@@ -369,8 +369,9 @@ module Prism
     end
 
     def test_AssocSplatNode
-      # TODO:
-      # test_prism_eval("foo = { a: 1 }; { **foo }")
+      test_prism_eval("foo = { a: 1 }; { **foo }")
+      test_prism_eval("foo = { a: 1 }; bar = foo; { **foo, b: 2, **bar, c: 3 }")
+      test_prism_eval("foo = { a: 1 }; { b: 2, **foo, c: 3}")
     end
 
     def test_HashNode
-- 
cgit v1.2.3