sorbet-runtime 0.5.6317 → 0.5.6332

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '097683b0eba207cf9b04accf22d9dcf1661848f4d5e1254b34e3e3240b160351'
-  data.tar.gz: cf2c97818079eba96e2eeba28b05844ce8ac8adb5c69ae940ad6031d6bdd9e43
+  metadata.gz: 1694a688e3b73cbb921d292cac640856edf617e826a3e8e119f5fd9c43c52099
+  data.tar.gz: ee936f9dcc26c79ad6614c9f98461cf7a1ffd23626cb36652a143af43aa2926f
 SHA512:
-  metadata.gz: 221da0912324d1e0ab19d23ac4fb6c30fc1ba2a9db54b9eb466e807a1093205fe5393564a1a40783e7dee15bc167afa4f1f88445b12e1364e80120b0f00853ee
-  data.tar.gz: '0893b271dd3d604514531424bde009256dc0a14d56e4379b5184b27ac01f10d140cb7d467217d854ebacb77489ef1874b324133f69ac2cf1df39c68c53de6b20'
+  metadata.gz: 2b65d6a7b161994dd421dba90392a7087d60deb4608c2c4cec4220c5c06fe3c71c75747292aaec95e90d245bccafad468f230139e640d0ae9ad4bafc8326c17a
+  data.tar.gz: fc2e647d852f06efc68d8b9ef3b21007c6ae16a9ec7d22a9a8cdccd58598118120bea6ad2c89d054c19d105a87d91a4f6cc939aa9743ddef10fab831ca845284

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
@@ -100,9 +103,16 @@ module T::Private::Methods
     if !module_with_final?(target)
       return
     end
+    source_method_names.filter! do |method_name|
+      was_ever_final?(method_name)
+    end
+    if source_method_names.empty?
+      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|
+      next if !module_with_final?(ancestor)
       source_method_names.each do |method_name|
         # the usage of method_owner_and_name_to_key(ancestor, method_name) instead of
         # method_to_key(ancestor.instance_method(method_name)) is not (just) an optimization, but also required for
@@ -148,6 +158,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)
@@ -229,6 +247,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)
@@ -411,6 +430,8 @@ module T::Private::Methods
     if !module_with_final?(target) && !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)

metadata

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