Merge branch 'master' into truffle-head

Conflicts: truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
jruby · Mar 21, 2015 · 3b85723 · 3b85723
2 parents f397049 + ed2f7e0
commit 3b85723
Show file tree

Hide file tree

Showing 53 changed files with 1,369 additions and 284 deletions.
diff --git a/core/src/main/java/org/jruby/RubyGenerator.java b/core/src/main/java/org/jruby/RubyGenerator.java
@@ -62,7 +62,7 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block b
         IRubyObject proc;
 
         if (args.length == 0) {
-            proc = RubyProc.newProc(runtime, block, Block.Type.LAMBDA);
+            proc = RubyProc.newProc(runtime, block, Block.Type.PROC);
         } else {
             if (!(args[0] instanceof RubyProc)) {
                 throw runtime.newTypeError(args[0], runtime.getProc());

diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -1402,45 +1402,9 @@ public IRubyObject reverse(ThreadContext context) {
 
     @JRubyMethod(name = "reverse")
     public IRubyObject reverse19(ThreadContext context) {
-        Ruby runtime = context.runtime;
-        if (value.getRealSize() <= 1) return strDup(context.runtime);
-
-        byte[]bytes = value.getUnsafeBytes();
-        int p = value.getBegin();
-        int len = value.getRealSize();
-        byte[]obytes = new byte[len];
-
-        boolean single = true;
-        Encoding enc = value.getEncoding();
-        // this really needs to be inlined here
-        if (singleByteOptimizable(enc)) {
-            for (int i = 0; i <= len >> 1; i++) {
-                obytes[i] = bytes[p + len - i - 1];
-                obytes[len - i - 1] = bytes[p + i];
-            }
-        } else {
-            int end = p + len;
-            int op = len;
-            while (p < end) {
-                int cl = StringSupport.length(enc, bytes, p, end);
-                if (cl > 1 || (bytes[p] & 0x80) != 0) {
-                    single = false;
-                    op -= cl;
-                    System.arraycopy(bytes, p, obytes, op, cl);
-                    p += cl;
-                } else {
-                    obytes[--op] = bytes[p++];
-                }
-            }
-        }
-
-        RubyString result = new RubyString(runtime, getMetaClass(), new ByteList(obytes, false));
-
-        if (getCodeRange() == CR_UNKNOWN) setCodeRange(single ? CR_7BIT : CR_VALID);
-        Encoding encoding = value.getEncoding();
-        result.value.setEncoding(encoding);
-        result.copyCodeRangeForSubstr(this, encoding);
-        return result.infectBy(this);
+        RubyString str = strDup(context.runtime);
+        str.reverse_bang19(context);
+        return str;
     }
 
     public RubyString reverse_bang(ThreadContext context) {

diff --git a/core/src/main/java/org/jruby/ast/ArgsNode.java b/core/src/main/java/org/jruby/ast/ArgsNode.java
@@ -154,6 +154,18 @@ protected Arity calculateArity() {
     public boolean hasKwargs() {
         return hasKwargs;
     }
+
+    public int countKeywords() {
+        if (hasKwargs) {
+            if (keywords == null) {
+                // Rest keyword argument
+                return 0;
+            }
+            return keywords.size();
+        } else {
+            return 0;
+        }
+    }
 
     protected boolean hasMasgnArgs() {
         if (preCount > 0) for (Node node : pre.childNodes()) {
@@ -254,6 +266,10 @@ public KeywordRestArgNode getKeyRest() {
         return keyRest;
     }
 
+    public boolean hasKeyRest() {
+        return keyRest != null;
+    }
+
     public void checkArgCount(Ruby runtime, int argsLength) {
         Arity.checkArgumentCount(runtime, argsLength, requiredArgsCount, maxArgsCount, hasKwargs);
     }

diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -187,23 +187,21 @@ public static IRubyObject initiateBreak(ThreadContext context, DynamicScope dynS
         }
     }
 
-    @Interp @JIT
+    @JIT
     public static IRubyObject handleBreakAndReturnsInLambdas(ThreadContext context, StaticScope scope, DynamicScope dynScope, Object exc, Block.Type blockType) throws RuntimeException {
         if ((exc instanceof IRBreakJump) && inNonMethodBodyLambda(scope, blockType)) {
             // We just unwound all the way up because of a non-local break
-            if (((IRBreakJump)exc).scopeToReturnTo == dynScope) throw IRException.BREAK_LocalJumpError.getException(context.getRuntime());
-        }
-
-        if (exc instanceof IRReturnJump && (blockType == null || inLambda(blockType))) {
+            throw IRException.BREAK_LocalJumpError.getException(context.getRuntime());
+        } else if (exc instanceof IRReturnJump && (blockType == null || inLambda(blockType))) {
             // Ignore non-local return processing in non-lambda blocks.
             // Methods have a null blocktype
             return handleNonlocalReturn(scope, dynScope, exc, blockType);
+        } else {
+            // Propagate
+            Helpers.throwException((Throwable)exc);
+            // should not get here
+            return null;
         }
-
-        // Propagate
-        Helpers.throwException((Throwable)exc);
-        // should not get here
-        return null;
     }
 
     @JIT

diff --git a/spec/truffle/tags/core/array/delete_if_tags.txt b/spec/truffle/tags/core/array/delete_if_tags.txt
@@ -0,0 +1 @@
+fails:Array#delete_if returns self when called on an Array emptied with #shift
diff --git a/spec/truffle/tags/core/array/delete_tags.txt b/spec/truffle/tags/core/array/delete_tags.txt
@@ -1,2 +1 @@
 fails:Array#delete may be given a block that is executed if no element matches object
-fails:Array#delete raises a RuntimeError on a frozen array
diff --git a/spec/truffle/tags/core/array/pop_tags.txt b/spec/truffle/tags/core/array/pop_tags.txt
diff --git a/spec/truffle/tags/core/array/reject_tags.txt b/spec/truffle/tags/core/array/reject_tags.txt
@@ -1,4 +1,2 @@
-fails:Array#reject! removes elements for which block is true
-fails:Array#reject! properly handles recursive arrays
 fails:Array#reject! returns nil when called on an Array emptied with #shift
-fails:Array#reject! returns nil if no changes are made
+
diff --git a/spec/truffle/tags/core/array/rindex_tags.txt b/spec/truffle/tags/core/array/rindex_tags.txt
diff --git a/spec/truffle/tags/core/array/sort_by_tags.txt b/spec/truffle/tags/core/array/sort_by_tags.txt
@@ -1,7 +1,2 @@
-fails:Array#sort_by! sorts array in place by passing each element to the given block
-fails:Array#sort_by! returns an Enumerator if not given a block
-fails:Array#sort_by! completes when supplied a block that always returns the same result
-fails:Array#sort_by! raises a RuntimeError on a frozen array
-fails:Array#sort_by! raises a RuntimeError on an empty frozen array
 fails:Array#sort_by! returns the specified value when it would break in the given block
 fails:Array#sort_by! makes some modification even if finished sorting when it would break in the given block
diff --git a/spec/truffle/tags/core/string/append_tags.txt b/spec/truffle/tags/core/string/append_tags.txt
@@ -1,4 +1 @@
 fails:String#<< with Integer concatencates the argument interpreted as a codepoint
-fails:String#<< with Integer returns a ASCII-8BIT string if self is US-ASCII and the argument is between 128-255 (inclusive)
-fails:String#<< with Integer raises RangeError if the argument is an invalid codepoint for self's encoding
-fails:String#<< with Integer raises RangeError if the argument is negative
diff --git a/spec/truffle/tags/core/string/chop_tags.txt b/spec/truffle/tags/core/string/chop_tags.txt
diff --git a/spec/truffle/tags/core/string/concat_tags.txt b/spec/truffle/tags/core/string/concat_tags.txt
@@ -1,4 +1 @@
 fails:String#concat with Integer concatencates the argument interpreted as a codepoint
-fails:String#concat with Integer returns a ASCII-8BIT string if self is US-ASCII and the argument is between 128-255 (inclusive)
-fails:String#concat with Integer raises RangeError if the argument is an invalid codepoint for self's encoding
-fails:String#concat with Integer raises RangeError if the argument is negative
diff --git a/spec/truffle/tags/core/string/delete_tags.txt b/spec/truffle/tags/core/string/delete_tags.txt
@@ -1,2 +1 @@
 fails:String#delete deletes multibyte characters
-fails:String#delete deletes all chars in a sequence
diff --git a/spec/truffle/tags/core/string/dump_tags.txt b/spec/truffle/tags/core/string/dump_tags.txt
diff --git a/spec/truffle/tags/core/string/force_encoding_tags.txt b/spec/truffle/tags/core/string/force_encoding_tags.txt
diff --git a/spec/truffle/tags/core/string/reverse_tags.txt b/spec/truffle/tags/core/string/reverse_tags.txt
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -16,6 +16,9 @@
 
 JRUBY_DIR = File.expand_path('../..', __FILE__)
 
+# wait for sub-processes to handle the interrupt
+trap(:INT) {}
+
 module Utilities
 
   def self.graal_version
@@ -70,7 +73,7 @@ def self.igv_running?
 
   def self.ensure_igv_running
     unless igv_running?
-      spawn "#{find_graal_mx} igv"
+      spawn "#{find_graal_mx} igv", pgroup: true
       sleep 5
       puts
       puts
@@ -111,15 +114,10 @@ module ShellUtils
   private
 
   def raw_sh(*args)
-    begin
-      result = system(*args)
-    rescue Interrupt
-      abort # Ignore Ctrl+C
-    else
-      unless result
-        $stderr.puts "FAILED (#{$?}): #{args * ' '}"
-        exit $?.exitstatus
-      end
+    result = system(*args)
+    unless result
+      $stderr.puts "FAILED (#{$?}): #{args * ' '}"
+      exit $?.exitstatus
     end
   end
 

diff --git a/tool/truffle-findbugs-exclude.xml b/tool/truffle-findbugs-exclude.xml
@@ -90,4 +90,8 @@
     <Class name="org.jruby.truffle.nodes.debug.AssertNotCompiledNode" />
     <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
   </Match>
+  <Match>
+    <Class name="org.jruby.truffle.nodes.RubyCallNode" />
+    <Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS" />
+  </Match>
 </FindBugsFilter>
diff --git a/truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java b/truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
@@ -96,7 +96,7 @@ public void init() {
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, SymbolNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ThreadNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, TrueClassNodesFactory.getFactories());
-        CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, PrimitiveNodesFactory.getFactories());
+        CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, TrufflePrimitiveNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, EncodingNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, EncodingConverterNodesFactory.getFactories());
         CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, MethodNodesFactory.getFactories());
@@ -169,7 +169,7 @@ public void init() {
 
     @Override
     public Object execute(final Object self, final org.jruby.ast.RootNode rootNode) {
-	return execute(TranslatorDriver.ParserContext.TOP_LEVEL, self, null, rootNode);
+        return execute(TranslatorDriver.ParserContext.TOP_LEVEL, self, null, rootNode);
     }
 
     public Object execute(final TranslatorDriver.ParserContext parserContext, final Object self, final MaterializedFrame parentFrame, final org.jruby.ast.RootNode rootNode) {