sorbet-runtime 0.5.5851 → 0.5.5863

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c454cb15e39b7993b14f0351e090110a0f49b19f2fb851179699e1e70f87f9d2
-  data.tar.gz: 37f92c032bd9af70232c7400549287cf9a026fb4137eeb7b1af23d95289e3286
+  metadata.gz: f848903aee26071b35bc3c642774c8856e5347a486acd4f1beeeea4a27e67472
+  data.tar.gz: 51ed3e44c8cdf3ddbc1691e40fbdd7070acd8d2a17bee15e6a811c234d7188ef
 SHA512:
-  metadata.gz: 52989449f24b265c5612ed9916b107d0b81fb1565d6e70399f9f5d5b4bcf92c03b6cd6ecdbe9986cf8a4cead03b75a886ac133dcb076011e164cca15ebc464a9
-  data.tar.gz: a4dc951f7c3572c7557870b57fdf5ef409c61858f909f4603b6c92999c2040ea29841a120b916d5a678c11c6d83468a357d5fe3ce15f60b9b9cdc5f3118f5732
+  metadata.gz: b9c6a1dfd845ac6566f75621d757db6631442652477ec4b3548334282af3d1864711625bff2072940fca648424567efa53be85268950d5964eaaa220da26d2b6
+  data.tar.gz: c09ccc4ddb6c2ff95cd8b4f673171c93f379f19c5c878b71072357e02749eb368eeb5614ffb03ecb05a5afe32b6b64663f6fce804ceb242fa8bc0670b8f6dafc

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

@@ -207,7 +207,11 @@ module T::Private::Methods
     new_method = nil
     T::Private::ClassUtils.replace_method(mod, method_name) do |*args, &blk|
       method_sig = T::Private::Methods.maybe_run_sig_block_for_method(new_method)
-      method_sig ||= T::Private::Methods._handle_missing_method_signature(mod, original_method, __callee__)
+      method_sig ||= T::Private::Methods._handle_missing_method_signature(
+        self,
+        original_method,
+        __callee__,
+      )
 
       # Should be the same logic as CallValidation.wrap_method_if_needed but we
       # don't want that extra layer of indirection in the callstack
@@ -238,28 +242,40 @@ module T::Private::Methods
     end
   end
 
-  def self._handle_missing_method_signature(mod, original_method, callee)
+  def self._handle_missing_method_signature(receiver, original_method, callee)
     method_sig = T::Private::Methods.signature_for_method(original_method)
-    aliasing_method = mod.instance_method(callee)
-
-    if method_sig && aliasing_method != original_method && aliasing_method.original_name == original_method.name
-      # We're handling a case where `alias` or `alias_method` was called for a
-      # method which had already had a `sig` applied.
-      #
-      # Note, this logic is duplicated above, make sure to keep changes in sync.
-      if method_sig.check_level == :always || (method_sig.check_level == :tests && T::Private::RuntimeLevels.check_tests?)
-        # Checked, so copy the original signature to the aliased copy.
-        T::Private::Methods.unwrap_method(mod, method_sig, aliasing_method)
-      else
-        # Unchecked, so just make `alias_method` behave as if it had been called pre-sig.
-        mod.send(:alias_method, callee, original_method.name)
-      end
-    else
-      raise "`sig` not present for method `#{aliasing_method.name}` but you're trying to run it anyways. " \
+    if !method_sig
+      raise "`sig` not present for method `#{callee}` on #{receiver.inspect} but you're trying to run it anyways. " \
         "This should only be executed if you used `alias_method` to grab a handle to a method after `sig`ing it, but that clearly isn't what you are doing. " \
         "Maybe look to see if an exception was thrown in your `sig` lambda or somehow else your `sig` wasn't actually applied to the method."
     end
 
+    if receiver.class <= original_method.owner
+      receiving_class = receiver.class
+    elsif receiver.singleton_class <= original_method.owner
+      receiving_class = receiver.singleton_class
+    elsif receiver.is_a?(Module) && receiver <= original_method.owner
+      receiving_class = receiver
+    else
+      raise "#{receiver} is not related to #{original_method} - how did we get here?"
+    end
+
+    # Check for a case where `alias` or `alias_method` was called for a
+    # method which had already had a `sig` applied. In that case, we want
+    # to avoid hitting this slow path again, by moving to a faster validator
+    # just like we did or will for the original method.
+    #
+    # If this isn't an `alias` or `alias_method` case, we're probably in the
+    # middle of some metaprogramming using a Method object, e.g. a pattern like
+    # `arr.map(&method(:foo))`. There's nothing really we can do to optimize
+    # that here.
+    receiving_method = receiving_class.instance_method(callee)
+    if receiving_method != original_method && receiving_method.original_name == original_method.name
+      aliasing_mod = receiving_method.owner
+      method_sig = method_sig.as_alias(callee)
+      unwrap_method(aliasing_mod, method_sig, original_method)
+    end
+
     method_sig
   end
 
@@ -281,7 +297,7 @@ module T::Private::Methods
         Signature.new_untyped(method: original_method)
       end
 
-    unwrap_method(hook_mod, signature, original_method)
+    unwrap_method(signature.method.owner, signature, original_method)
     signature
   end
 
@@ -333,8 +349,8 @@ module T::Private::Methods
     end
   end
 
-  def self.unwrap_method(hook_mod, signature, original_method)
-    maybe_wrapped_method = CallValidation.wrap_method_if_needed(signature.method.owner, signature, original_method)
+  def self.unwrap_method(mod, signature, original_method)
+    maybe_wrapped_method = CallValidation.wrap_method_if_needed(mod, signature, original_method)
     @signatures_by_method[method_to_key(maybe_wrapped_method)] = signature
   end
 

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

@@ -121,6 +121,15 @@ class T::Private::Methods::Signature
     end
   end
 
+  attr_writer :method_name
+  protected :method_name=
+
+  def as_alias(alias_name)
+    new_sig = clone
+    new_sig.method_name = alias_name
+    new_sig
+  end
+
   def arg_count
     @arg_types.length
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.5851
+  version: 0.5.5863
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest