jruby · Jun 14, 2016 · Jun 14, 2016 · Jun 15, 2016 · Jun 15, 2016 · Jun 15, 2016
Showing with 34 additions and 27 deletions.

+16 −21 core/src/main/java/org/jruby/Ruby.java

+0 −2 core/src/main/java/org/jruby/ir/IRBuilder.java

+2 −1 core/src/main/java/org/jruby/ir/targets/JVMVisitor.java

+0 −1 core/src/main/ruby/jruby/kernel/kernel.rb

+16 −2 tool/jt.rb
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -727,22 +727,10 @@ private RootNode addGetsLoop(RootNode oldRoot, boolean printing, boolean process
      *
      * @param scriptNode The root node of the script to be executed
      * bytecode before execution
+ *     @param wrap whether to wrap the execution in an anonymous module
      * @return The result of executing the script
      */
-    @Deprecated
-    public IRubyObject runNormally(Node scriptNode, boolean unused) {
-        return runNormally(scriptNode);
-    }
-
-    /**
-     * Run the specified script without any of the loop-processing wrapper
-     * code.
-     *
-     * @param scriptNode The root node of the script to be executed
-     * bytecode before execution
-     * @return The result of executing the script
-     */
-    public IRubyObject runNormally(Node scriptNode) {
+    public IRubyObject runNormally(Node scriptNode, boolean wrap) {
         ScriptAndCode scriptAndCode = null;
         boolean compile = getInstanceConfig().getCompileMode().shouldPrecompileCLI();
         if (compile || config.isShowBytecode()) {
@@ -757,7 +745,7 @@ public IRubyObject runNormally(Node scriptNode) {
                 return getNil();
             }
 
-            return runScript(scriptAndCode.script());
+            return runScript(scriptAndCode.script(), wrap);
         } else {
             // FIXME: temporarily allowing JIT to fail for $0 and fall back on interpreter
 //            failForcedCompile(scriptNode);
@@ -766,6 +754,18 @@ public IRubyObject runNormally(Node scriptNode) {
         }
     }
 
+    /**
+     * Run the specified script without any of the loop-processing wrapper
+     * code.
+     *
+     * @param scriptNode The root node of the script to be executed
+     * bytecode before execution
+     * @return The result of executing the script
+     */
+    public IRubyObject runNormally(Node scriptNode) {
+        return runNormally(scriptNode, false);
+    }
+
     private ScriptAndCode precompileCLI(RootNode scriptNode) {
         ScriptAndCode scriptAndCode = null;
 
@@ -3025,12 +3025,7 @@ public void compileAndLoadFile(String filename, InputStream in, boolean wrap) {
         try {
             context.setFileAndLine(scriptNode.getFile(), scriptNode.getLine());
 
-            if (config.isAssumePrinting() || config.isAssumeLoop()) {
-                runWithGetsLoop(scriptNode, config.isAssumePrinting(), config.isProcessLineEnds(),
-                        config.isSplit());
-            } else {
-                runNormally(scriptNode);
-            }
+            runNormally(scriptNode, wrap);
         } finally {
             context.setFileAndLine(oldFile, oldLine);
         }

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -1,12 +1,10 @@
 package org.jruby.ir;
 
-import javafx.beans.binding.When;
 import org.jcodings.specific.ASCIIEncoding;
 import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.Ruby;
 import org.jruby.RubyInstanceConfig;
 import org.jruby.ast.*;
-import org.jruby.ast.types.ILiteralNode;
 import org.jruby.ast.types.INameNode;
 import org.jruby.compiler.NotCompilableException;
 import org.jruby.lexer.yacc.ISourcePosition;

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -1020,7 +1020,8 @@ public void CallInstr(CallInstr callInstr) {
         if (callInstr instanceof OneFixnumArgNoBlockCallInstr && MethodIndex.getFastFixnumOpsMethod(callInstr.getName()) != null) {
             oneFixnumArgNoBlockCallInstr((OneFixnumArgNoBlockCallInstr) callInstr);
             return;
-        } else if (callInstr instanceof OneFloatArgNoBlockCallInstr) {
+        } else if (callInstr instanceof OneFloatArgNoBlockCallInstr &&
+                MethodIndex.getFastFloatOpsMethod(callInstr.getName()) != null) {
             oneFloatArgNoBlockCallInstr((OneFloatArgNoBlockCallInstr) callInstr);
             return;
         }

diff --git a/core/src/main/ruby/jruby/kernel/kernel.rb b/core/src/main/ruby/jruby/kernel/kernel.rb
@@ -1,6 +1,5 @@
 module Kernel
   module_function
-  p :here
   def require_relative(relative_arg)
     relative_arg = relative_arg.to_path if relative_arg.respond_to? :to_path
     relative_arg = JRuby::Type.convert_to_str(relative_arg)

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -144,6 +144,14 @@ def self.find_repo(name)
     end
     raise "Can't find the #{name} repo - clone it into the repository directory or its parent"
   end
+
+  def self.find_benchmark(benchmark)
+    if File.exist?(File.join(JRUBY_DIR, benchmark))
+      benchmark
+    else
+      File.join(find_repo('all-ruby-benchmarks'), benchmark)
+    end
+  end
 
   def self.find_gem(name)
     ["#{JRUBY_DIR}/lib/ruby/gems/shared/gems"].each do |dir|
@@ -267,7 +275,7 @@ def raw_sh(*args)
       continue_on_failure = true
     end
     if !args.last.is_a?(Hash) || !args.last.delete(:no_print_cmd)
-      puts "$ #{printable_cmd(args)}"
+      STDERR.puts "$ #{printable_cmd(args)}"
     end
     timeout = nil
     if args.last.is_a?(Hash)
@@ -942,10 +950,16 @@ def tarball(*options)
   end
 
   def benchmark(*args)
+    benchmark = args.pop
+    raise 'no benchmark given' unless benchmark
+    benchmark = Utilities.find_benchmark(benchmark)
+    raise 'benchmark not found' unless File.exist?(benchmark)
     run '--graal',
         '-I', "#{Utilities.find_gem('deep-bench')}/lib",
         '-I', "#{Utilities.find_gem('benchmark-ips')}/lib",
-        "#{Utilities.find_gem('benchmark-interface')}/bin/benchmark", *args
+        "#{Utilities.find_gem('benchmark-interface')}/bin/benchmark",
+        benchmark,
+        *args
   end
 
   def check_ambiguous_arguments