Resolve todos and fix tests

Author: jacob-shops

zjit/src/hir_effect/gen_hir_effect.rb

@@ -45,12 +45,17 @@ def to_graphviz type
 # Start at Any. All types are subtypes of Any.
 any = Type.new "Any"
 # Build the effect universe.
-frame = any.subtype "Frame"
 world = any.subtype "World"
+other = world.subtype "Other"
+frame = world.subtype "Frame"
 pc = frame.subtype "PC"
 locals = frame.subtype "Locals"
 stack = frame.subtype "Stack"
 
+# Use the smallest unsigned value needed to describe all effect bits
+# If it becomes an issue, this can be generated but for now we do it manually
+$int_label = "u8"
+
 # Define a new type that can be subclassed (most of them).
 # If c_name is given, mark the rb_cXYZ object as equivalent to this exact type.
 def base_type name, c_name: nil
@@ -79,13 +84,13 @@ def final_type name, base: $object, c_name: nil
 
 # Assign individual bits to type leaves and union bit patterns to nodes with subtypes
 num_bits = 0
-$bits = {"None" => ["0u64"]}
+$bits = {"None" => ["0#{$int_label}"]}
 $numeric_bits = {"None" => 0}
 Set[any, *any.all_subtypes].sort_by(&:name).each {|type|
   subtypes = type.subtypes
   if subtypes.empty?
     # Assign bits for leaves
-    $bits[type.name] = ["1u64 << #{num_bits}"]
+    $bits[type.name] = ["1#{$int_label} << #{num_bits}"]
     $numeric_bits[type.name] = 1 << num_bits
     num_bits += 1
   else
@@ -116,17 +121,17 @@ def add_union name, type_names
 puts "mod bits {"
 $bits.keys.sort.map {|type_name|
   subtypes = $bits[type_name].join(" | ")
-  puts "  pub const #{type_name}: u64 = #{subtypes};"
+  puts "  pub const #{type_name}: #{$int_label} = #{subtypes};"
 }
-puts "  pub const AllBitPatterns: [(&str, u64); #{$bits.size}] = ["
+puts "  pub const AllBitPatterns: [(&str, #{$int_label}); #{$bits.size}] = ["
 # Sort the bit patterns by decreasing value so that we can print the densest
 # possible to-string representation of a Type. For example, CSigned instead of
 # CInt8|CInt16|...
 $numeric_bits.sort_by {|key, val| -val}.each {|type_name, _|
   puts "    (\"#{type_name}\", #{type_name}),"
 }
 puts "  ];"
-puts "  pub const NumEffectBits: u64 = #{num_bits};
+puts "  pub const NumEffectBits: #{$int_label} = #{num_bits};
 }"
 
 puts "pub mod effects {