sorbet-runtime 0.6.13621 → 0.6.13632

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e220a94cf6f6774a19e1e2ef7e002a4791fe057d9d801a3c809911491947b855
-  data.tar.gz: 3cf34f7d429e26e768a222a60a0e3be23ea5f911a17e19ae396544998c886647
+  metadata.gz: 4257e8ca00e1add499a378928571bea2674281fc10b65796b343f1ab934ad360
+  data.tar.gz: f3960d20e4b93c67c085b8745f5c29560296c741930f3d7f6207a0bfae394260
 SHA512:
-  metadata.gz: 05d4b08638f1752b3386df3e0fff8e245b795082242900dff532e7f4bafa5c669511d47bd7700feb9b6c69f6c65e534523df1ef11bcc3af9c84e5df6bd58f4ba
-  data.tar.gz: 6910ad7fb4a7650c11f79a9c0918ce6ecb4015ef42ee741b90c327d65f9852ddd53e6964c82d382c41fbcb1fbd9f0d41c748b2be0522302dd8b3f9e044d1ee25
+  metadata.gz: b1e44f1984ffc3e8b309834a19491128133f0956842ce6372acb4caa2b2b669f7e1669f5d8213a8d614f1c900015b0239d5c0d2e9f87e426dad796a1155b9814
+  data.tar.gz: f97d4f469a9ef194c4d169c77eb3653c65ce6990c45dfabeb3b1be0b5247e48c942e75c165ba341d97307e1924567bc62bf9099ac76ac4724d94b5c667ecbb5a

data/lib/types/private/methods/signature.rb

@@ -7,9 +7,22 @@
 class T::Private::Methods::Signature
   attr_reader :method, :method_name, :arg_types, :kwarg_types, :block_type,
               :rest_type, :keyrest_type, :bind, :effective_return_type,
-              :return_type, :mode, :req_arg_count, :req_kwarg_names,
-              :check_level, :parameters, :on_failure, :override_allow_incompatible,
-              :defined_raw
+              :return_type, :req_arg_count, :req_kwarg_names, :on_failure
+
+  # @flags packs, from the low bits up: mode (3 bits), check_level (2 bits),
+  # override_allow_incompatible (2 bits), and defined_raw (1 bit).
+  FLAG_MODES = T::Private::Methods::Modes::MODES
+  FLAG_CHECK_LEVELS = T::Private::RuntimeLevels::LEVELS
+  FLAG_ALLOW_INCOMPATIBLE = [false, true, :visibility].freeze
+  MODE_MASK = 0b111
+  CHECK_LEVEL_SHIFT = 3
+  CHECK_LEVEL_MASK = 0b11
+  ALLOW_INCOMPATIBLE_SHIFT = 5
+  ALLOW_INCOMPATIBLE_MASK = 0b11
+  DEFINED_RAW_BIT = 1 << 7
+  private_constant :FLAG_MODES, :FLAG_CHECK_LEVELS, :FLAG_ALLOW_INCOMPATIBLE, :MODE_MASK,
+                   :CHECK_LEVEL_SHIFT, :CHECK_LEVEL_MASK, :ALLOW_INCOMPATIBLE_SHIFT,
+                   :ALLOW_INCOMPATIBLE_MASK, :DEFINED_RAW_BIT
 
   # T.unsafe: `UnboundMethod#parameters` lies and says `T::Array[[Symbol, Symbol]]`.
   # Sorbet can't lub tuple types, meaning that `T.any([Symbol], [Symbol,
@@ -45,7 +58,7 @@ class T::Private::Methods::Signature
     )
   end
 
-  def initialize(method:, method_name:, raw_arg_types:, raw_return_type:, bind:, mode:, check_level:, on_failure:, parameters: method.parameters, override_allow_incompatible: false, defined_raw: false)
+  def initialize(method:, method_name:, raw_arg_types:, raw_return_type:, bind:, mode:, check_level:, on_failure:, parameters: nil, override_allow_incompatible: false, defined_raw: false)
     check_level = check_level.nil? ? T::Private::RuntimeLevels.default_checked_level : check_level
     @method = method
     @method_name = method_name
@@ -59,12 +72,13 @@ class T::Private::Methods::Signature
       @return_type
     end
     @bind = NilClass.===(bind) ? bind : T::Utils.coerce(bind)
-    @mode = mode
-    @check_level = check_level
     @parameters = parameters
+    parameters ||= method.parameters
     @on_failure = on_failure
-    @override_allow_incompatible = override_allow_incompatible
-    @defined_raw = defined_raw
+    @flags = flag_index(FLAG_MODES, mode, 'mode') |
+             (flag_index(FLAG_CHECK_LEVELS, check_level, 'check_level') << CHECK_LEVEL_SHIFT) |
+             (flag_index(FLAG_ALLOW_INCOMPATIBLE, override_allow_incompatible, 'override_allow_incompatible') << ALLOW_INCOMPATIBLE_SHIFT) |
+             (defined_raw ? DEFINED_RAW_BIT : 0)
 
     # Use T.untyped in lieu of T.nilable to try to avoid unnecessary allocations.
     arg_types = nil
@@ -159,6 +173,7 @@ class T::Private::Methods::Signature
       i += 1
     end
 
+    @parameters ||= parameters unless @rest_type.nil?
     @arg_types = arg_types || EMPTY_LIST
     @kwarg_types = kwarg_types || EMPTY_HASH
     @req_arg_count = req_arg_count
@@ -175,6 +190,10 @@ class T::Private::Methods::Signature
   end
 
   # Names are derived rather than stored so that Signature fits in a smaller GC slot.
+  def parameters
+    @parameters || @method.parameters
+  end
+
   def block_name
     parameter_name(:block)
   end
@@ -187,6 +206,22 @@ class T::Private::Methods::Signature
     parameter_name(:keyrest)
   end
 
+  def mode
+    FLAG_MODES.fetch(@flags & MODE_MASK)
+  end
+
+  def check_level
+    FLAG_CHECK_LEVELS.fetch((@flags >> CHECK_LEVEL_SHIFT) & CHECK_LEVEL_MASK)
+  end
+
+  def override_allow_incompatible
+    FLAG_ALLOW_INCOMPATIBLE.fetch((@flags >> ALLOW_INCOMPATIBLE_SHIFT) & ALLOW_INCOMPATIBLE_MASK)
+  end
+
+  def defined_raw
+    @flags.anybits?(DEFINED_RAW_BIT)
+  end
+
   def arg_count
     @arg_types.length
   end
@@ -283,12 +318,16 @@ class T::Private::Methods::Signature
 
   # The rest param directly follows the positional params unless required params come after it.
   private def fast_rest_name
-    param_kind, param_name = @parameters[@arg_types.length]
+    param_kind, param_name = parameters[@arg_types.length]
     param_kind == :rest ? param_name : parameter_name(:rest)
   end
 
   private def parameter_name(kind)
-    @parameters.assoc(kind)&.[](1)
+    parameters.assoc(kind)&.[](1)
+  end
+
+  private def flag_index(values, value, field)
+    values.index(value) || raise(ArgumentError.new("Invalid #{field} for `#{@method_name}`: #{value.inspect}"))
   end
 
   EMPTY_LIST = [].freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.6.13621
+  version: 0.6.13632
 platform: ruby
 authors:
 - Stripe