Refactor to avoid duplication

Author: eregon

src/main/java/org/truffleruby/core/method/MethodEntry.java

@@ -9,10 +9,12 @@
  */
 package org.truffleruby.core.method;
 
+import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.language.methods.InternalMethod;
 
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.Truffle;
+import org.truffleruby.language.methods.SharedMethodInfo;
 
 public final class MethodEntry {
 
@@ -46,8 +48,8 @@ public InternalMethod getMethod() {
         return method;
     }
 
-    public void invalidate(String message) {
-        assumption.invalidate(message);
+    public void invalidate(RubyModule module, String methodName) {
+        assumption.invalidate(SharedMethodInfo.moduleAndMethodName(module, methodName));
     }
 
 }

src/main/java/org/truffleruby/core/module/ModuleFields.java

@@ -50,7 +50,6 @@
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.language.loader.ReentrantLockFreeingMap;
 import org.truffleruby.language.methods.InternalMethod;
-import org.truffleruby.language.methods.SharedMethodInfo;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectGraphNode;
 import org.truffleruby.language.objects.classvariables.ClassVariableStorage;
@@ -462,7 +461,7 @@ public void addMethod(RubyContext context, Node currentNode, InternalMethod meth
 
         if (!context.getCoreLibrary().isInitializing()) {
             if (previousMethodEntry != null) {
-                previousMethodEntry.invalidate(SharedMethodInfo.moduleAndMethodName(rubyModule, method.getName()));
+                previousMethodEntry.invalidate(rubyModule, method.getName());
             }
             // invalidate assumptions to not use an AST-inlined methods
             changedMethod(method.getName());
@@ -491,7 +490,7 @@ public boolean removeMethod(String methodName) {
 
         MethodEntry removedEntry = methods.remove(methodName);
         if (removedEntry != null) {
-            removedEntry.invalidate(SharedMethodInfo.moduleAndMethodName(rubyModule, methodName));
+            removedEntry.invalidate(rubyModule, methodName);
         }
 
         changedMethod(methodName);
@@ -741,7 +740,7 @@ public void newMethodsVersion(List<String> methodsToInvalidate) {
                 if (methodEntry == null) {
                     break;
                 } else {
-                    methodEntry.invalidate(SharedMethodInfo.moduleAndMethodName(rubyModule, entryToInvalidate));
+                    methodEntry.invalidate(rubyModule, entryToInvalidate);
                     if (methods.replace(entryToInvalidate, methodEntry, methodEntry.withNewAssumption())) {
                         break;
                     }