Increase IMEMO_MASK by one bit

We are out of imemo types because IMEMO_MASK uses 4 bits and we have 16
imemo types. This makes it not possible to experiment with new imemo types,
so we can increase it by one bit to have 16 more imemo types.

Author: peterzhu2118

internal/imemo.h

@@ -15,17 +15,17 @@
 #include "ruby/internal/stdbool.h"     /* for bool */
 #include "ruby/ruby.h"          /* for rb_block_call_func_t */
 
-#define IMEMO_MASK   (FL_USER0 | FL_USER1 | FL_USER2 | FL_USER3)
-
-/* FL_USER0 to FL_USER3 is for type */
-#define IMEMO_FL_USHIFT (FL_USHIFT + 4)
-#define IMEMO_FL_USER0 FL_USER4
-#define IMEMO_FL_USER1 FL_USER5
-#define IMEMO_FL_USER2 FL_USER6
-#define IMEMO_FL_USER3 FL_USER7
-#define IMEMO_FL_USER4 FL_USER8
-#define IMEMO_FL_USER5 FL_USER9
-#define IMEMO_FL_USER6 FL_USER10
+#define IMEMO_MASK   (FL_USER0 | FL_USER1 | FL_USER2 | FL_USER3 | FL_USER4)
+
+/* FL_USER0 to FL_USER4 is for type */
+#define IMEMO_FL_USHIFT (FL_USHIFT + 5)
+#define IMEMO_FL_USER0 FL_USER5
+#define IMEMO_FL_USER1 FL_USER6
+#define IMEMO_FL_USER2 FL_USER7
+#define IMEMO_FL_USER3 FL_USER8
+#define IMEMO_FL_USER4 FL_USER9
+#define IMEMO_FL_USER5 FL_USER10
+#define IMEMO_FL_USER6 FL_USER11
 
 enum imemo_type {
     imemo_env            =  0,

misc/lldb_cruby.py

@@ -417,7 +417,7 @@ def lldb_inspect(debugger, target, result, val):
             append_expression(debugger, "*(struct RMatch *) %0#x" % val.GetValueAsUnsigned(), result)
         elif flType == RUBY_T_IMEMO:
             # I'm not sure how to get IMEMO_MASK out of lldb. It's not in globals()
-            imemo_type = (flags >> RUBY_FL_USHIFT) & 0x0F # IMEMO_MASK
+            imemo_type = (flags >> RUBY_FL_USHIFT) & 0x1F # IMEMO_MASK
 
             print("T_IMEMO: ", file=result)
             append_expression(debugger, "(enum imemo_type) %d" % imemo_type, result)

misc/lldb_rb/constants.py

@@ -3,4 +3,4 @@
 HEAP_PAGE_ALIGN = (1 << HEAP_PAGE_ALIGN_LOG)
 HEAP_PAGE_SIZE = HEAP_PAGE_ALIGN
 
-IMEMO_MASK = 0x0F
+IMEMO_MASK = 0x1F

tool/timeline/lib/converter_defs.rb

@@ -85,7 +85,7 @@ def self.FL_USER_N(n)
   })
 
   # Keep in sync with `IMEMO_MASK` in `internal/imemo.h`.
-  IMEMO_MASK = 0x0f
+  IMEMO_MASK = 0x1f
 
   # Keep in sync with both `internal/string.h` and `include/ruby/internal/core/rstring.h`.
   StringFlags = FlagsConverter.new({

yjit/src/cruby.rs

@@ -754,7 +754,7 @@ mod manual_defs {
     pub const RSTRUCT_EMBED_LEN_MASK: usize = (RUBY_FL_USER7 | RUBY_FL_USER6 | RUBY_FL_USER5 | RUBY_FL_USER4 | RUBY_FL_USER3 |RUBY_FL_USER2 | RUBY_FL_USER1) as usize;
 
     // From iseq.h - via a different constant, which seems to confuse bindgen
-    pub const ISEQ_TRANSLATED: usize = RUBY_FL_USER7 as usize;
+    pub const ISEQ_TRANSLATED: usize = RUBY_FL_USER8 as usize;
 
     // We'll need to encode a lot of Ruby struct/field offsets as constants unless we want to
     // redeclare all the Ruby C structs and write our own offsetof macro. For now, we use constants.

zjit/src/cruby.rs

@@ -1224,7 +1224,7 @@ mod manual_defs {
     pub const RSTRUCT_EMBED_LEN_MASK: usize = (RUBY_FL_USER7 | RUBY_FL_USER6 | RUBY_FL_USER5 | RUBY_FL_USER4 | RUBY_FL_USER3 |RUBY_FL_USER2 | RUBY_FL_USER1) as usize;
 
     // From iseq.h - via a different constant, which seems to confuse bindgen
-    pub const ISEQ_TRANSLATED: usize = RUBY_FL_USER7 as usize;
+    pub const ISEQ_TRANSLATED: usize = RUBY_FL_USER8 as usize;
 
     // We'll need to encode a lot of Ruby struct/field offsets as constants unless we want to
     // redeclare all the Ruby C structs and write our own offsetof macro. For now, we use constants.