From fcdbdff631a1a6bcc2229d448ed7c76041fe3258 Mon Sep 17 00:00:00 2001
From: Kazuki Tsujimoto <kazuki@callcc.net>
Date: Sun, 2 Aug 2020 01:03:43 +0900
Subject: rb_{ary,fnd}_pattern_info: Remove imemo member to reduce memory usage

This is a partial revert commit of 8f096226e1b76f95f4d853d3dea2bc75eeeb5244.

NODE layout:

  Before:

       | ARYPTN | FNDPTN | HSHPTN
    ---+--------+--------+-----------
    u1 | pconst | pconst | pconst
    u2 | unused | unused | pkwargs
    u3 | apinfo | fpinfo | pkwrestarg

  After:

       | ARYPTN | FNDPTN | HSHPTN
    ---+--------+--------+-----------
    u1 | imemo  | imemo  | pkwargs
    u2 | pconst | pconst | pconst
    u3 | apinfo | fpinfo | pkwrestarg
---
 node.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'node.h')

diff --git a/node.h b/node.h
index 8252955ef2..b6fefb4410 100644
--- a/node.h
+++ b/node.h
@@ -273,8 +273,8 @@ typedef struct RNode {
 
 #define nd_brace u2.argc
 
-#define nd_pconst     u1.node
-#define nd_pkwargs    u2.node
+#define nd_pkwargs    u1.node
+#define nd_pconst     u2.node
 #define nd_pkwrestarg u3.node
 
 #define nd_apinfo u3.apinfo
@@ -458,14 +458,12 @@ struct rb_ary_pattern_info {
     NODE *pre_args;
     NODE *rest_arg;
     NODE *post_args;
-    VALUE imemo;
 };
 
 struct rb_fnd_pattern_info {
     NODE *pre_rest_arg;
     NODE *args;
     NODE *post_rest_arg;
-    VALUE imemo;
 };
 
 struct parser_params;
-- 
cgit v1.2.1