Support compiling PM_DEFINED_NODE with anonymous rest argument forwar…

…ding (* and **)
tompng · Jan 7, 2025 · 311d399 · 311d399
1 parent 4fbe684
commit 311d399
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/prism_compile.c b/prism_compile.c
@@ -3845,9 +3845,10 @@ pm_compile_defined_expr0(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_l
               }
               case PM_ASSOC_SPLAT_NODE: {
                 const pm_assoc_splat_node_t *assoc_splat = (const pm_assoc_splat_node_t *) element;
-
-                pm_compile_defined_expr0(iseq, assoc_splat->value, node_location, ret, popped, scope_node, true, lfinish, false);
-                PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+                if (assoc_splat->value != NULL) {
+                    pm_compile_defined_expr0(iseq, assoc_splat->value, node_location, ret, popped, scope_node, true, lfinish, false);
+                    PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+                }
 
                 break;
               }
@@ -3862,13 +3863,15 @@ pm_compile_defined_expr0(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_l
       }
       case PM_SPLAT_NODE: {
         const pm_splat_node_t *cast = (const pm_splat_node_t *) node;
-        pm_compile_defined_expr0(iseq, cast->expression, node_location, ret, popped, scope_node, in_condition, lfinish, false);
+        if (cast->expression != NULL) {
+            pm_compile_defined_expr0(iseq, cast->expression, node_location, ret, popped, scope_node, in_condition, lfinish, false);
 
-        if (!lfinish[1]) {
-            lfinish[1] = NEW_LABEL(location.line);
-        }
+            if (!lfinish[1]) {
+                lfinish[1] = NEW_LABEL(location.line);
+            }
 
-        PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+            PUSH_INSNL(ret, location, branchunless, lfinish[1]);
+        }
         dtype = DEFINED_EXPR;
         break;
       }

diff --git a/test/ruby/test_compile_prism.rb b/test/ruby/test_compile_prism.rb
@@ -270,6 +270,8 @@ def self.m1; defined?(return) end
       assert_prism_eval("defined?((alias $a $b))")
       assert_prism_eval("defined?(!(a..b))")
       assert_prism_eval("def f(...); defined?(p(...)); end")
+      assert_prism_eval("def f(*, **, &); defined?(p(*, **, &)); end")
+      assert_prism_eval("def f(*, **, &); defined?([*, **]); end")
       assert_prism_eval("defined?(!/foo/)")
       assert_prism_eval('defined?(!/#{1}/)')
       assert_prism_eval("defined?((END{}))")