Merge pull request jruby#9237 from evaniainbrooks/8876-import-methods-2

Fix for import_methods does not allow calling another refined method

Author: headius

core/src/main/java/org/jruby/RubyModule.java

@@ -6880,8 +6880,20 @@ private static void refinementImportMethodsIter(ThreadContext context, RubyModul
             DynamicMethod dup = entry.getValue().dup();
             dup.setImplementationClass(selfModule);
 
-            // maybe insufficient if we have already compiled assuming no refinements
-            ((AbstractIRMethod) dup).getIRScope().setIsMaybeUsingRefinements();
+            AbstractIRMethod dupAir = (AbstractIRMethod) dup;
+            dupAir.getIRScope().setIsMaybeUsingRefinements();
+
+            RubyModule definedAt = selfModule.getRefinementStoreForWrite().definedAt;
+            if (definedAt != null) {
+                Map<RubyModule, RubyModule> refinements = definedAt.getRefinements();
+                if (!refinements.isEmpty()) {
+                    dupAir
+                      .getStaticScope()
+                      .getOverlayModuleForWrite(context)
+                      .getRefinementsForWrite()
+                      .putAll(refinements);
+                }
+            }
 
             selfModule.addMethod(context, entry.getKey(), dup);
         }

core/src/main/java/org/jruby/ir/IRScope.java

@@ -246,6 +246,7 @@ public IRManager getManager() {
 
     public void setIsMaybeUsingRefinements() {
         maybeUsingRefinements = true;
+        fullInterpreterContext = null;
     }
 
     public boolean parentMaybeUsingRefinements() {

core/src/main/java/org/jruby/ir/instructions/CallBase.java

@@ -64,14 +64,26 @@ protected CallBase(IRScope scope, Operation op, CallType callType, RubySymbol na
         hasClosure = closure != NullBlock.INSTANCE;
         this.name = name;
         this.callType = callType;
-        this.callSite = callSite == null ? getCallSiteFor(scope, callType, name.idString(), callSiteId, hasLiteralClosure(), potentiallyRefined) : callSite;
+
+        boolean effectivelyRefined = potentiallyRefined || (scope != null && scope.maybeUsingRefinements());
+        boolean hasUnrefinedCallSite = callSite != null && !(callSite instanceof RefinedCachingCallSite);
+        if (effectivelyRefined && hasUnrefinedCallSite) {
+            callSite = null;
+        }
+
+        if (callSite == null) {
+          this.callSite = getCallSiteFor(scope, callType, name.idString(), callSiteId, hasLiteralClosure(), effectivelyRefined);
+        } else {
+          this.callSite = callSite;
+        }
+
         splatMap = IRRuntimeHelpers.buildSplatMap(args);
         flagsComputed = false;
         canBeEval = true;
         targetRequiresCallersBinding = true;
         targetRequiresCallersFrame = true;
         dontInline = false;
-        this.potentiallyRefined = potentiallyRefined;
+        this.potentiallyRefined = effectivelyRefined;
 
         captureFrameReadsAndWrites();
     }