sorbet-runtime 0.5.6330 → 0.5.6346

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0da778c9f0f22c310083fc51efae568d37ccd4bbd351b1d6594befd781fd4d04
-  data.tar.gz: 156d25d18fccbb910c51e95e5bf38e0b62a6675784ce5ebc9051890057c589d5
+  metadata.gz: ccd35b0362921e31eb5c9a7bfbab5b33f337eca5e785175db007ce503deaf418
+  data.tar.gz: c44f1a563ea2a4bb6be35068957fcb0d08116745dc26f7ade284bf2dc66d2720
 SHA512:
-  metadata.gz: 04c6c3df67d068040058f07d755801085ac888e781daaad45a4c92776937df998b484e09a80561846abcb065eb1ff8c2ed2181828e98f1dca93d84e4b0e74301
-  data.tar.gz: dbfa5e1cd1a01e92d5a2917330ee9dd3493e50919fdcd74ceabc5d86bd23e82e0eb162a1ffda933688357a2439436bf0d0d7d420d8ef0d3dc579553908eea760
+  metadata.gz: f8b8cc96bc8ec2a866dd726a7828f5cab96251dbc391d03f29c6ffb5d4555a966a28c216df849d93c539993e19b37d4f73f04bc5244968dc4559705eff9f9a8f
+  data.tar.gz: 84d5da8c69776de610a6103166a8a756885c36fb2095c65d262f495696b06b71b7854dcba4662f50066f62d68c33bfc4ebcb82c15913e6559160740d56a315a1

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

@@ -11,6 +11,9 @@ module T::Private::Methods
   # - they are done possibly before any sig block has run.
   # - they are done even if the method being defined doesn't have a sig.
   @final_methods = Set.new
+  # stores method names that were declared final without regard for where.
+  # enables early rejection of names that we know can't induce final method violations.
+  @was_ever_final_names = Set.new
   # a non-singleton is a module for which at least one of the following is true:
   # - is declared final
   # - defines a method that is declared final
@@ -96,10 +99,10 @@ module T::Private::Methods
   # when target includes a module with instance methods source_method_names, ensure there is zero intersection between
   # the final instance methods of target and source_method_names. so, for every m in source_method_names, check if there
   # is already a method defined on one of target_ancestors with the same name that is final.
+  #
+  # we assume that source_method_names has already been filtered to only include method
+  # names that were declared final at one point.
   def self._check_final_ancestors(target, target_ancestors, source_method_names)
-    if !module_with_final?(target)
-      return
-    end
     # use reverse_each to check farther-up ancestors first, for better error messages. we could avoid this if we were on
     # the version of ruby that adds the optional argument to method_defined? that allows you to exclude ancestors.
     target_ancestors.reverse_each do |ancestor|
@@ -149,6 +152,14 @@ module T::Private::Methods
     @final_methods.include?(method_key)
   end
 
+  private_class_method def self.add_was_ever_final(method_name)
+    @was_ever_final_names.add(method_name)
+  end
+
+  private_class_method def self.was_ever_final?(method_name)
+    @was_ever_final_names.include?(method_name)
+  end
+
   def self.add_module_with_final(mod)
     @modules_with_final.add(mod)
     @modules_with_final.add(mod.singleton_class)
@@ -170,7 +181,10 @@ module T::Private::Methods
     if T::Private::Final.final_module?(mod) && (current_declaration.nil? || !current_declaration.final)
       raise "#{mod} was declared as final but its method `#{method_name}` was not declared as final"
     end
-    _check_final_ancestors(mod, mod.ancestors, [method_name])
+    # Don't compute mod.ancestors if we don't need to bother checking final-ness.
+    if was_ever_final?(method_name) && module_with_final?(mod)
+      _check_final_ancestors(mod, mod.ancestors, [method_name])
+    end
 
     # We need to fetch the active declaration again, as _check_final_ancestors
     # may have reset it (see the comment in that method for details).
@@ -230,6 +244,7 @@ module T::Private::Methods
     @sig_wrappers[key] = sig_block
     if current_declaration.final
       add_final_method(key)
+      add_was_ever_final(method_name)
       # use hook_mod, not mod, because for example, we want class C to be marked as having final if we def C.foo as
       # final. change this to mod to see some final_method tests fail.
       add_module_with_final(hook_mod)
@@ -408,13 +423,30 @@ module T::Private::Methods
 
   # the module target is adding the methods from the module source to itself. we need to check that for all instance
   # methods M on source, M is not defined on any of target's ancestors.
-  def self._hook_impl(target, target_ancestors, source)
-    if !module_with_final?(target) && !module_with_final?(source)
+  def self._hook_impl(target, singleton_class, source)
+    target_was_final = module_with_final?(target)
+    if !target_was_final && !module_with_final?(source)
       return
     end
+    # we do not need to call add_was_ever_final here, because we have already marked
+    # any such methods when source was originally defined.
     add_module_with_final(target)
     install_hooks(target)
-    _check_final_ancestors(target, target_ancestors - source.ancestors, source.instance_methods)
+
+    if !target_was_final
+      return
+    end
+
+    methods = source.instance_methods
+    methods.select! do |method_name|
+      was_ever_final?(method_name)
+    end
+    if methods.empty?
+      return
+    end
+
+    target_ancestors = singleton_class ? target.singleton_class.ancestors : target.ancestors
+    _check_final_ancestors(target, target_ancestors - source.ancestors, methods)
   end
 
   def self.set_final_checks_on_hooks(enable)
@@ -428,15 +460,15 @@ module T::Private::Methods
     else
       old_included = T::Private::ClassUtils.replace_method(Module, :included) do |arg|
         old_included.bind(self).call(arg)
-        ::T::Private::Methods._hook_impl(arg, arg.ancestors, self)
+        ::T::Private::Methods._hook_impl(arg, false, self)
       end
       old_extended = T::Private::ClassUtils.replace_method(Module, :extended) do |arg|
         old_extended.bind(self).call(arg)
-        ::T::Private::Methods._hook_impl(arg, arg.singleton_class.ancestors, self)
+        ::T::Private::Methods._hook_impl(arg, true, self)
       end
       old_inherited = T::Private::ClassUtils.replace_method(Class, :inherited) do |arg|
         old_inherited.bind(self).call(arg)
-        ::T::Private::Methods._hook_impl(arg, arg.ancestors, self)
+        ::T::Private::Methods._hook_impl(arg, false, self)
       end
       @old_hooks = [old_included, old_extended, old_inherited]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.6330
+  version: 0.5.6346
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest