Merge branch 'master' into 9120-incompat-encoding

Author: evaniainbrooks

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

@@ -40,8 +40,10 @@
 import static org.jruby.runtime.Arity.checkArgumentCount;
 import static org.jruby.runtime.Helpers.invokedynamic;
 import static org.jruby.runtime.ThreadContext.CALL_KEYWORD;
+import static org.jruby.runtime.ThreadContext.CALL_KEYWORD_EMPTY;
 import static org.jruby.runtime.ThreadContext.clearCallInfo;
 import static org.jruby.runtime.ThreadContext.hasKeywords;
+import static org.jruby.runtime.ThreadContext.hasNonemptyKeywords;
 import static org.jruby.runtime.ThreadContext.resetCallInfo;
 import static org.jruby.runtime.invokedynamic.MethodNames.HASH;
 import static org.jruby.util.RubyStringBuilder.str;
@@ -309,7 +311,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject self, IRubyOb
 
             RubyHash init;
             int callInfo = resetCallInfo(context);
-            if (hasKeywords(callInfo)) {
+            if (hasNonemptyKeywords(callInfo)) {
                 if (!(hashOrElt instanceof RubyHash)) {
                     throw argumentError(context, 1, 0, 0);
                 }

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

@@ -167,7 +167,7 @@ public static RubyHash createGlobalsAndENV(ThreadContext context, GlobalVariable
         Object.defineConstant(context, "RUBY_RELEASE_DATE", release);
         Object.defineConstant(context, "RUBY_PLATFORM", platform);
 
-        IRubyObject description = RubyString.newFString(runtime, OutputStrings.getVersionString());
+        IRubyObject description = RubyString.newFString(runtime, OutputStrings.getVersionString(instanceConfig));
         Object.defineConstant(context, "RUBY_DESCRIPTION", description);
 
         IRubyObject copyright = RubyString.newFString(runtime, OutputStrings.getCopyrightString());

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

@@ -71,6 +71,7 @@
 import static org.jruby.runtime.Helpers.invokedynamic;
 import static org.jruby.runtime.ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR;
 import static org.jruby.runtime.ThreadContext.hasKeywords;
+import static org.jruby.runtime.ThreadContext.hasNonemptyKeywords;
 import static org.jruby.runtime.Visibility.PRIVATE;
 import static org.jruby.runtime.invokedynamic.MethodNames.HASH;
 import static org.jruby.RubyEnumerator.SizeFn;
@@ -531,7 +532,7 @@ public IRubyObject initialize(ThreadContext context) {
 
     @JRubyMethod(visibility = PRIVATE)
     public IRubyObject initialize(ThreadContext context, IRubyObject arg0) {
-        boolean keywords = hasKeywords(ThreadContext.resetCallInfo(context));
+        boolean keywords = hasNonemptyKeywords(ThreadContext.resetCallInfo(context));
 
         if (keywords) {
             return setupStructValuesFromHash(context, (RubyHash) arg0);

core/src/main/java/org/jruby/embed/ScriptingContainer.java

@@ -1013,7 +1013,7 @@ public void setJitMaxSize(int maxSize) {
      * @return version information.
      */
     public String getSupportedRubyVersion() {
-        return OutputStrings.getVersionString().trim();
+        return OutputStrings.getVersionString(getProvider().getRuntime().getInstanceConfig()).trim();
     }
 
     /**

core/src/main/java/org/jruby/ext/thread/Mutex.java

@@ -106,7 +106,8 @@ public IRubyObject lock(ThreadContext context) {
 
         checkRelocking(context);
 
-        if (this.lockingThread == parentThread) {
+        RubyThread lockingThread = this.lockingThread;
+        if (lockingThread == parentThread && context.getFiber() != lockingThread.getContext().getFiber()) {
             throw context.runtime.newThreadError("deadlock; lock already owned by another fiber belonging to the same thread");
         }
 
@@ -123,7 +124,7 @@ public IRubyObject lock(ThreadContext context) {
             }
         }
 
-        this.lockingThread = thread;
+        this.lockingThread = parentThread;
 
         // always check for thread interrupts after acquiring lock
         try {
@@ -204,7 +205,7 @@ public IRubyObject owned_p(ThreadContext context) {
 
     private void checkRelocking(ThreadContext context) {
         if (lock.isHeldByCurrentThread()) {
-            throw context.runtime.newThreadError("Mutex relocking by same thread");
+            throw context.runtime.newThreadError("deadlock; recursive locking");
         }
     }
 

core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java

@@ -2189,7 +2189,7 @@ private static IRubyObject[] prepareBlockArgsInternal(ThreadContext context, Blo
 
         // FIXME: For NORMAL/THREAD but it is unclear if we really need any keyword logic in here anymore.
         org.jruby.runtime.Signature sig = block.getBody().getSignature();
-        if (!sig.isSpreadable()) return args;
+        if (!sig.isSpreadable() || (sig.opt() + sig.required() == 1 && !sig.hasRest())) return args;
 
         // We get here only when we need both required and optional/rest args
         // (keyword or non-keyword in either case).

core/src/main/java/org/jruby/ir/targets/indy/ArrayDerefInvokeSite.java

@@ -78,7 +78,7 @@ public IRubyObject invoke(ThreadContext context, IRubyObject caller, IRubyObject
             args[0] = dupString(context, (RubyString) args[0]);
 
             if (methodMissing(entry, caller)) {
-                return callMethodMissing(entry, callType, context, self, selfClass, methodName, args, block);
+                return callMethodMissing(entry, visibilityCallType, context, self, selfClass, methodName, args, block);
             }
 
             mh = getHandle(context, self, entry);
@@ -131,7 +131,7 @@ public IRubyObject fail(ThreadContext context, IRubyObject caller, IRubyObject s
         entry = selfClass.searchWithCache(name);
 
         if (methodMissing(entry, caller)) {
-            return callMethodMissing(entry, callType, context, self, selfClass, name, arg0, block);
+            return callMethodMissing(entry, visibilityCallType, context, self, selfClass, name, arg0, block);
         }
 
         cache = entry;

core/src/main/java/org/jruby/ir/targets/indy/BuildDynamicStringSite.java

@@ -5,6 +5,7 @@
 import org.jruby.Appendable;
 import org.jruby.RubyString;
 import org.jruby.api.Convert;
+import org.jruby.runtime.CallType;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
@@ -127,7 +128,9 @@ public BuildDynamicStringSite(MethodType type, Object[] stringArgs) {
     private static MethodHandle constructGuardedToStringFilter() {
         // create an invoke site for the to_s call
         MethodType toSType = MethodType.methodType(IRubyObject.class, ThreadContext.class, IRubyObject.class);
-        CallSite toS = SelfInvokeSite.bootstrap(MethodHandles.lookup(), "invokeFunctional:to_s", toSType, 0, 0, "", -1);
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        InvokeSite site = new SelfInvokeSite(toSType, "to_s", CallType.FUNCTIONAL, CallType.NORMAL, false, 0, "", -1);
+        CallSite toS = InvokeSite.bootstrap(site, lookup);
         MethodHandle toS_handle = toS.dynamicInvoker();
 
         // Cast the result to RubyString, or else call anyToString on the original

core/src/main/java/org/jruby/ir/targets/indy/InvokeSite.java

@@ -94,6 +94,7 @@ public abstract class InvokeSite extends MutableCallSite {
     public final Signature fullSignature;
     public final int arity;
     protected final String methodName;
+    protected final CallType visibilityCallType;
     final MethodHandle fallback;
     private final SiteTracker tracker = new SiteTracker();
     private final long siteID = SITE_ID.getAndIncrement();
@@ -695,25 +696,27 @@ public String name() {
         return methodName;
     }
 
-    public final CallType callType;
-
     public InvokeSite(MethodType type, String name, CallType callType, boolean literalClosure, int flags, String file, int line) {
+        this(type, name, callType, callType, literalClosure, flags, file, line);
+    }
+
+    protected InvokeSite(MethodType type, String name, CallType structuralCallType, CallType visibilityCallType, boolean literalClosure, int flags, String file, int line) {
         super(type);
         this.methodName = name;
-        this.callType = callType;
+        this.visibilityCallType = visibilityCallType;
         this.literalClosure = literalClosure;
         this.file = file;
         this.line = line;
         this.flags = flags;
 
         Signature startSig;
 
-        if (callType == CallType.SUPER) {
+        if (structuralCallType == CallType.SUPER) {
             // super calls receive current class argument, so offsets and signature are different
             startSig = JRubyCallSite.STANDARD_SUPER_SIG;
             functional = false;
             argOffset = 4;
-        } else if (callType == CallType.FUNCTIONAL || callType == CallType.VARIABLE) {
+        } else if (structuralCallType == CallType.FUNCTIONAL || structuralCallType == CallType.VARIABLE) {
             startSig = JRubyCallSite.STANDARD_FSITE_SIG;
             functional = true;
             argOffset = 2;
@@ -818,7 +821,7 @@ private CacheEntry methodMissingEntry(ThreadContext context, RubyClass selfClass
             logMethodMissing();
         }
         Visibility visibility = entry.method.getVisibility();
-        return Helpers.createMethodMissingEntry(context, selfClass, callType, visibility, entry.token, methodName);
+        return Helpers.createMethodMissingEntry(context, selfClass, visibilityCallType, visibility, entry.token, methodName);
     }
 
     private void finishBinding(CacheEntry entry, MethodHandle mh, IRubyObject self, RubyClass selfClass, SwitchPoint switchPoint) {
@@ -916,7 +919,7 @@ public IRubyObject fail(ThreadContext context, IRubyObject caller, IRubyObject s
         entry = selfClass.searchWithCache(name);
 
         if (methodMissing(entry, caller)) {
-            return callMethodMissing(entry, callType, context, self, selfClass, name, args, block);
+            return callMethodMissing(entry, visibilityCallType, context, self, selfClass, name, args, block);
         }
 
         cache = entry;
@@ -941,7 +944,7 @@ public IRubyObject failf(ThreadContext context, IRubyObject self, IRubyObject[]
         entry = selfClass.searchWithCache(name);
 
         if (methodMissing(entry)) {
-            return callMethodMissing(entry, callType, context, self, selfClass, name, args, block);
+            return callMethodMissing(entry, visibilityCallType, context, self, selfClass, name, args, block);
         }
 
         cache = entry;
@@ -980,7 +983,7 @@ public IRubyObject fail(ThreadContext context, IRubyObject caller, IRubyObject s
         entry = selfClass.searchWithCache(name);
 
         if (methodMissing(entry, caller)) {
-            return callMethodMissing(entry, callType, context, self, selfClass, name, arg0, block);
+            return callMethodMissing(entry, visibilityCallType, context, self, selfClass, name, arg0, block);
         }
 
         cache = entry;
@@ -1005,7 +1008,7 @@ public IRubyObject failf(ThreadContext context, IRubyObject self, IRubyObject ar
         entry = selfClass.searchWithCache(name);
 
         if (methodMissing(entry)) {
-            return callMethodMissing(entry, callType, context, self, selfClass, name, arg0, block);
+            return callMethodMissing(entry, visibilityCallType, context, self, selfClass, name, arg0, block);
         }
 
         cache = entry;
@@ -1030,7 +1033,7 @@ public IRubyObject fail(ThreadContext context, IRubyObject caller, IRubyObject s
         entry = selfClass.searchWithCache(name);
 
         if (methodMissing(entry, caller)) {
-            return callMethodMissing(entry, callType, context, self, selfClass, name, arg0, arg1, block);
+            return callMethodMissing(entry, visibilityCallType, context, self, selfClass, name, arg0, arg1, block);
         }
 
         cache = entry;
@@ -1055,7 +1058,7 @@ public IRubyObject failf(ThreadContext context, IRubyObject self, IRubyObject ar
         entry = selfClass.searchWithCache(name);
 
         if (methodMissing(entry)) {
-            return callMethodMissing(entry, callType, context, self, selfClass, name, arg0, arg1, block);
+            return callMethodMissing(entry, visibilityCallType, context, self, selfClass, name, arg0, arg1, block);
         }
 
         cache = entry;
@@ -1080,7 +1083,7 @@ public IRubyObject fail(ThreadContext context, IRubyObject caller, IRubyObject s
         entry = selfClass.searchWithCache(name);
 
         if (methodMissing(entry, caller)) {
-            return callMethodMissing(entry, callType, context, self, selfClass, name, arg0, arg1, arg2, block);
+            return callMethodMissing(entry, visibilityCallType, context, self, selfClass, name, arg0, arg1, arg2, block);
         }
 
         cache = entry;
@@ -1105,7 +1108,7 @@ public IRubyObject failf(ThreadContext context, IRubyObject self, IRubyObject ar
         entry = selfClass.searchWithCache(name);
 
         if (methodMissing(entry)) {
-            return callMethodMissing(entry, callType, context, self, selfClass, name, arg0, arg1, arg2, block);
+            return callMethodMissing(entry, visibilityCallType, context, self, selfClass, name, arg0, arg1, arg2, block);
         }
 
         cache = entry;
@@ -1537,7 +1540,7 @@ public void setInitialTarget(MethodHandle target) {
     public boolean methodMissing(CacheEntry entry, IRubyObject caller) {
         DynamicMethod method = entry.method;
 
-        return method.isUndefined() || (!methodName.equals("method_missing") && !method.isCallableFrom(caller, callType));
+        return method.isUndefined() || (!methodName.equals("method_missing") && !method.isCallableFrom(caller, visibilityCallType));
     }
 
     public boolean methodMissing(CacheEntry entry) {

core/src/main/java/org/jruby/ir/targets/indy/SelfInvokeSite.java

@@ -21,12 +21,12 @@
 * Created by headius on 10/23/14.
 */
 public class SelfInvokeSite extends InvokeSite {
-    public SelfInvokeSite(MethodType type, String name, CallType callType, boolean literalClosure, int flags, String file, int line) {
-        super(type, name, callType, literalClosure, flags, file, line);
+    public SelfInvokeSite(MethodType type, String name, CallType structuralCallType, CallType visibilityCallType, boolean literalClosure, int flags, String file, int line) {
+        super(type, name, structuralCallType, visibilityCallType, literalClosure, flags, file, line);
     }
 
     public SelfInvokeSite(MethodType type, String name, CallType callType, int flags, String file, int line) {
-        this(type, name, callType, false, flags, file, line);
+        this(type, name, callType, callType, false, flags, file, line);
     }
 
     public static final Handle BOOTSTRAP = new Handle(
@@ -41,7 +41,7 @@ public static CallSite bootstrap(MethodHandles.Lookup lookup, String name, Metho
         List<String> nameComponents = StringSupport.split(name, ':');
         String methodName = JavaNameMangler.demangleMethodName(nameComponents.get(1));
         CallType callType = nameComponents.get(0).equals("callFunctional") ? CallType.FUNCTIONAL : CallType.VARIABLE;
-        InvokeSite site = new SelfInvokeSite(type, methodName, callType, literalClosure, flags, file, line);
+        InvokeSite site = new SelfInvokeSite(type, methodName, callType, callType, literalClosure, flags, file, line);
 
         return InvokeSite.bootstrap(site, lookup);
     }