sorbet-runtime 0.5.6318 → 0.5.6336

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd6788618f5fc30a4d7c9f40e9054d133f287893f3b48e3ee45d7b7daf1662b
-  data.tar.gz: 44b9b95d07b88fb70b004239f7d2944a39210b1e815d71536fdf07bf5cde3280
+  metadata.gz: 0b81aa820085c3f82ab984100ffa4eca33fc67ed314655818113d3af1968f7af
+  data.tar.gz: c8fc6e0885c3a8851e0a68f55dccda195006b1745c9d55dbb872723fc07c39b5
 SHA512:
-  metadata.gz: b336a468d3e2f4e14d8c31caebc6909bf9e5ab1fe9f786a6d08a2ce44b634fda319f235545416e044ed4dc0a4f689a4a8d8a0b79c6ab6e87a6a256e91b6f70c7
-  data.tar.gz: 9a10abe9f469b5c2dc56b9ff7c184bac63fab2b43b3d8295be550ed6fd55b29f6bacf43bf6fe51ac4503862ff7013c1fe7ec8ccb6bef23c7f54294ec026b699f
+  metadata.gz: acd340a1290ddba91e093fe315f25bf0e17f4648faf0fe0bfee7c09f3e1793ca7ff8832eb9fa5d880215fba349c2c4bb8512d3825dc5b4741bdc79cd92dc5928
+  data.tar.gz: d8297b731b4d5dfab1566092c53ae78e9db20d9a0fc9a7e51bf9d59f36b4361095df0d19ccd74ba6153e9145545e2cd5535515440e88a7529978a5700e05c739

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.select! 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.6318
+  version: 0.5.6336
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest