[GR-18163] Use MethodEntry Assumptions to track whether CoreMethodAss…

…umptions still hold PullRequest: truffleruby/4249
oracle · Apr 26, 2024 · d68ea09 · d68ea09
2 parents d226c36 + a608e54
commit d68ea09
Show file tree

Hide file tree

Showing 48 changed files with 183 additions and 114 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,8 @@ Changes:
 
 Memory Footprint:
 
+* Use inlined core method nodes even when modules are prepended to core classes (#3546, @eregon).
+
 # 24.0.0
 
 New features:

diff --git a/spec/ruby/core/module/prepend_spec.rb b/spec/ruby/core/module/prepend_spec.rb
@@ -75,6 +75,26 @@ def foo
     foo.call.should == 'm'
   end
 
+  it "updates the optimized method when a prepended module is updated" do
+    out = ruby_exe(<<~RUBY)
+    module M; end
+    class Integer
+      prepend M
+    end
+    l = -> { 1 + 2 }
+    p l.call
+    M.module_eval do
+      def +(o)
+        $called = true
+        super(o)
+      end
+    end
+    p l.call
+    p $called
+    RUBY
+    out.should == "3\n3\ntrue\n"
+  end
+
   it "updates the method when there is a base included method and the prepended module overrides it" do
     base_module = Module.new do
       def foo

diff --git a/spec/tags/core/module/prepend_tags.txt b/spec/tags/core/module/prepend_tags.txt
@@ -1,3 +1,4 @@
 fails:Module#prepend uses only new module when dupping the module
 fails:Module#prepend prepends a module if it is included in a super class
 fails:Module#prepend when module already exists in ancestor chain modifies the ancestor chain
+slow:Module#prepend updates the optimized method when a prepended module is updated
diff --git a/spec/tags/truffle/redefining_optimized_core_methods_tags.txt b/spec/tags/truffle/redefining_optimized_core_methods_tags.txt
@@ -1,2 +1,4 @@
 slow:Redefining optimized core methods emits performance warning for redefining core classes methods
 slow:Prepending a module into a class with optimised methods emits performance warning
+slow:Prepending a module into a class with optimised methods keeps the inlined nodes if no optimised method is overridden
+slow:Prepending a module into a class with optimised methods emits performance warning if that module overrides an optimised method
diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_else_branch.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_else_branch.yaml
@@ -78,7 +78,7 @@ ast: |
                               attributes:
                                   assumptions = [Assumption(valid, name=set_trace_func is not used)]
                                   flags = 0
-                                  integerCaseEqualAssumption = Assumption(valid, name=inlined Integer#===)
+                                  integerCaseEqualAssumption = Assumption(valid, name=core method is not overridden:)
                                   parameters = RubyCallNodeParameters{methodName='===', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
                                   sourceCharIndex = -1
                                   sourceLength = 0
@@ -110,7 +110,7 @@ ast: |
                                           attributes:
                                               assumptions = [Assumption(valid, name=set_trace_func is not used)]
                                               flags = 0
-                                              integerCaseEqualAssumption = Assumption(valid, name=inlined Integer#===)
+                                              integerCaseEqualAssumption = Assumption(valid, name=core method is not overridden:)
                                               parameters = RubyCallNodeParameters{methodName='===', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
                                               sourceCharIndex = -1
                                               sourceLength = 0

diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_multiple_values.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_multiple_values.yaml
@@ -78,7 +78,7 @@ ast: |
                                           attributes:
                                               assumptions = [Assumption(valid, name=set_trace_func is not used)]
                                               flags = 0
-                                              integerCaseEqualAssumption = Assumption(valid, name=inlined Integer#===)
+                                              integerCaseEqualAssumption = Assumption(valid, name=core method is not overridden:)
                                               parameters = RubyCallNodeParameters{methodName='===', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
                                               sourceCharIndex = -1
                                               sourceLength = 0
@@ -103,7 +103,7 @@ ast: |
                                           attributes:
                                               assumptions = [Assumption(valid, name=set_trace_func is not used)]
                                               flags = 0
-                                              integerCaseEqualAssumption = Assumption(valid, name=inlined Integer#===)
+                                              integerCaseEqualAssumption = Assumption(valid, name=core method is not overridden:)
                                               parameters = RubyCallNodeParameters{methodName='===', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
                                               sourceCharIndex = -1
                                               sourceLength = 0

diff --git a/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_single_value.yaml b/spec/truffle/parsing/fixtures/case/with_expression_and_when/with_single_value.yaml
@@ -77,7 +77,7 @@ ast: |
                               attributes:
                                   assumptions = [Assumption(valid, name=set_trace_func is not used)]
                                   flags = 0
-                                  integerCaseEqualAssumption = Assumption(valid, name=inlined Integer#===)
+                                  integerCaseEqualAssumption = Assumption(valid, name=core method is not overridden:)
                                   parameters = RubyCallNodeParameters{methodName='===', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
                                   sourceCharIndex = -1
                                   sourceLength = 0
@@ -109,7 +109,7 @@ ast: |
                                           attributes:
                                               assumptions = [Assumption(valid, name=set_trace_func is not used)]
                                               flags = 0
-                                              integerCaseEqualAssumption = Assumption(valid, name=inlined Integer#===)
+                                              integerCaseEqualAssumption = Assumption(valid, name=core method is not overridden:)
                                               parameters = RubyCallNodeParameters{methodName='===', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
                                               sourceCharIndex = -1
                                               sourceLength = 0

diff --git a/...le/parsing/fixtures/case/with_expression_and_when/with_string_literal_in_when_clause.yaml b/...le/parsing/fixtures/case/with_expression_and_when/with_string_literal_in_when_clause.yaml
@@ -20,7 +20,7 @@ ast: |
                   attributes:
                       assumptions = [Assumption(valid, name=set_trace_func is not used)]
                       flags = 0
-                      integerCaseEqualAssumption = Assumption(valid, name=inlined Integer#===)
+                      integerCaseEqualAssumption = Assumption(valid, name=core method is not overridden:)
                       parameters = RubyCallNodeParameters{methodName='===', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
                       sourceCharIndex = -1
                       sourceLength = 0

diff --git a/spec/truffle/parsing/fixtures/complex_numbers/with_rational_and_imaginary_parts.yaml b/spec/truffle/parsing/fixtures/complex_numbers/with_rational_and_imaginary_parts.yaml
@@ -8,7 +8,7 @@ ruby: |
 ast: |
   InlinedAddNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_%.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_%.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedModNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#%), Assumption(valid, name=inlined Float#%)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='%', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_&.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_&.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedBitAndNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#&)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='&', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_*.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_*.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedMulNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#*), Assumption(valid, name=inlined Float#*)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='*', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_+.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_+.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedAddNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_-.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_-.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedSubNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#-), Assumption(valid, name=inlined Float#-)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='-', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_-@.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_-@.yaml
@@ -7,7 +7,7 @@ ruby: |
 ast: |
   InlinedNegNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#-@), Assumption(valid, name=inlined Float#-@)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='-@', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 14

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_<.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_<.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedLessThanNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#<), Assumption(valid, name=inlined Float#<)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='<', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_<<.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_<<.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedLeftShiftNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#<<)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='<<', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_<=.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_<=.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedLessOrEqualNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#<=), Assumption(valid, name=inlined Float#<=)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='<=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_==.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_==.yaml
@@ -8,8 +8,8 @@ ast: |
       attributes:
           assumptions = [Assumption(valid, name=set_trace_func is not used)]
           flags = 1
-          floatEqualAssumption = Assumption(valid, name=inlined Float#==)
-          integerEqualAssumption = Assumption(valid, name=inlined Integer#==)
+          floatEqualAssumption = Assumption(valid, name=core method is not overridden:)
+          integerEqualAssumption = Assumption(valid, name=core method is not overridden:)
           parameters = RubyCallNodeParameters{methodName='==', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0
           sourceLength = 6

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_===.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_===.yaml
@@ -8,7 +8,7 @@ ast: |
       attributes:
           assumptions = [Assumption(valid, name=set_trace_func is not used)]
           flags = 1
-          integerCaseEqualAssumption = Assumption(valid, name=inlined Integer#===)
+          integerCaseEqualAssumption = Assumption(valid, name=core method is not overridden:)
           parameters = RubyCallNodeParameters{methodName='===', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0
           sourceLength = 7

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_>.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_>.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedGreaterThanNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#>), Assumption(valid, name=inlined Float#>)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='>', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_>=.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_>=.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedGreaterOrEqualNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#>=), Assumption(valid, name=inlined Float#>=)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='>=', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_>>.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_>>.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedRightShiftNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#>>)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='>>', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_nil?.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_nil?.yaml
@@ -7,7 +7,7 @@ ruby: |
 ast: |
   InlinedIsNilNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Nil#nil?)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='nil?', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 14

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_slash.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_slash.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedDivNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#/), Assumption(valid, name=inlined Float#/)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='/', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/method_calls/special_cases/method_|.yaml b/spec/truffle/parsing/fixtures/method_calls/special_cases/method_|.yaml
@@ -6,7 +6,7 @@ ruby: |
 ast: |
   InlinedBitOrNodeGen
       attributes:
-          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#|)]
+          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:)]
           flags = 1
           parameters = RubyCallNodeParameters{methodName='|', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
           sourceCharIndex = 0

diff --git a/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment.yaml b/spec/truffle/parsing/fixtures/operators/+=/attribute_assignment.yaml
@@ -104,7 +104,7 @@ ast: |
                                               arguments = [
                                                   InlinedAddNodeGen
                                                       attributes:
-                                                          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=inlined Integer#+), Assumption(valid, name=inlined Float#+)]
+                                                          assumptions = [Assumption(valid, name=set_trace_func is not used), Assumption(valid, name=core method is not overridden:), Assumption(valid, name=core method is not overridden:)]
                                                           flags = 0
                                                           parameters = RubyCallNodeParameters{methodName='+', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=false, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
                                                           sourceCharIndex = 0