Expand Data empty kwargs fix to Struct

This expands the fix from jruby#9215 to Struct and creats a
new utility method for checking that keywords were passed AND were
non-empty.

Fixes jruby#9224.

Author: headius

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

@@ -43,6 +43,7 @@
 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;
@@ -310,7 +311,7 @@ public static IRubyObject rbNew(ThreadContext context, IRubyObject self, IRubyOb
 
             RubyHash init;
             int callInfo = resetCallInfo(context);
-            if (hasKeywords(callInfo) && (callInfo & CALL_KEYWORD_EMPTY) == 0) {
+            if (hasNonemptyKeywords(callInfo)) {
                 if (!(hashOrElt instanceof RubyHash)) {
                     throw argumentError(context, 1, 0, 0);
                 }

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/runtime/ThreadContext.java

@@ -1588,6 +1588,14 @@ public static boolean hasKeywords(int callInfo) {
         return (callInfo & CALL_KEYWORD) != 0;
     }
 
+    public static boolean hasNonemptyKeywords(int callInfo) {
+        return (callInfo & CALL_KEYWORD) != 0 && !keywordsEmpty(callInfo);
+    }
+
+    public static boolean keywordsEmpty(int callInfo) {
+        return (callInfo & CALL_KEYWORD_EMPTY) != 0;
+    }
+
     @Deprecated(since = "9.3.0.0")
     public IRubyObject setBackRef(IRubyObject match) {
         if (match.isNil()) return clearBackRef();