jruby · Jun 14, 2016 · Jun 14, 2016
Showing with 21 additions and 61 deletions.

+0 −9 .travis.yml

+14 −51 core/src/main/java/org/jruby/Ruby.java

+6 −1 core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java

+1 −0 core/src/main/ruby/jruby/kernel/kernel.rb
diff --git a/.travis.yml b/.travis.yml
@@ -105,15 +105,6 @@ matrix:
     #  group: edge
     #  jdk: oraclejdk9
 
-branches:
-  only:
-    - master
-    - jruby-1_7
-    - truffle-head
-    - /^test-.*$/
-    - /^ha-feature/
-    - ruby-2.4
-
 install: tool/travis-install.sh
 script: tool/travis-script.sh
 

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -3015,61 +3015,24 @@ public void loadScope(IRScope scope, boolean wrap) {
     public void compileAndLoadFile(String filename, InputStream in, boolean wrap) {
         InputStream readStream = in;
 
-        Script script = null;
-
-        try {
-            // read full contents of file, hash it, and try to load that class first
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            byte[] buffer = new byte[1024];
-            int num;
-            while ((num = in.read(buffer)) > -1) {
-                baos.write(buffer, 0, num);
-            }
-            buffer = baos.toByteArray();
-            String hash = JITCompiler.getHashForBytes(buffer);
-            final String className = JITCompiler.RUBY_JIT_PREFIX + ".FILE_" + hash;
-
-            // FIXME: duplicated from ClassCache
-            Class contents;
-            try {
-                contents = getJRubyClassLoader().loadClass(className);
-                if (LOG.isDebugEnabled()) { // RubyInstanceConfig.JIT_LOADING_DEBUG
-                    LOG.debug("found jitted code for " + filename + " at class: " + className);
-                }
-                script = (Script) contents.newInstance();
-                readStream = new ByteArrayInputStream(buffer);
-            } catch (ClassNotFoundException cnfe) {
-                if (LOG.isDebugEnabled()) { // RubyInstanceConfig.JIT_LOADING_DEBUG
-                    LOG.debug("no jitted code in classloader for file " + filename + " at class: " + className);
-                }
-            } catch (InstantiationException ex) {
-                if (LOG.isDebugEnabled()) { // RubyInstanceConfig.JIT_LOADING_DEBUG
-                    LOG.debug("jitted code could not be instantiated for file " + filename + " at class: " + className + ' ' + ex);
-                }
-            } catch (IllegalAccessException ex) {
-                if (LOG.isDebugEnabled()) { // RubyInstanceConfig.JIT_LOADING_DEBUG
-                    LOG.debug("jitted code could not be instantiated for file " + filename + " at class: " + className + ' ' + ex);
-                }
-            }
-        } catch (IOException ioe) {
-            // TODO: log something?
-        }
-
         // script was not found in cache above, so proceed to compile
         RootNode scriptNode = (RootNode) parseFile(readStream, filename, null);
-        if (script == null) {
-            ScriptAndCode scriptAndCode = tryCompile(scriptNode,
-                new ClassDefiningJRubyClassLoader(getJRubyClassLoader())
-            );
-            if (scriptAndCode != null) script = scriptAndCode.script();
-        }
 
-        if (script == null) {
-            failForcedCompile(scriptNode);
+        ThreadContext context = getCurrentContext();
 
-            runInterpreter(scriptNode);
-        } else {
-            runScript(script, wrap);
+        String oldFile = context.getFile();
+        int oldLine = context.getLine();
+        try {
+            context.setFileAndLine(scriptNode.getFile(), scriptNode.getLine());
+
+            if (config.isAssumePrinting() || config.isAssumeLoop()) {
+                runWithGetsLoop(scriptNode, config.isAssumePrinting(), config.isProcessLineEnds(),
+                        config.isSplit());
+            } else {
+                runNormally(scriptNode);
+            }
+        } finally {
+            context.setFileAndLine(oldFile, oldLine);
         }
     }
 

diff --git a/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java b/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
@@ -232,7 +232,12 @@ public void load(Ruby runtime, boolean wrap) {
             InputStream ris = null;
             try {
                 ris = resource.inputStream();
-                runtime.loadFile(scriptName, new LoadServiceResourceInputStream(ris), wrap);
+
+                if (runtime.getInstanceConfig().getCompileMode().shouldPrecompileAll()) {
+                    runtime.compileAndLoadFile(scriptName, ris, wrap);
+                } else {
+                    runtime.loadFile(scriptName, new LoadServiceResourceInputStream(ris), wrap);
+                }
             } catch(IOException e) {
                 throw runtime.newLoadError("no such file to load -- " + searchName, searchName);
             } finally {

diff --git a/core/src/main/ruby/jruby/kernel/kernel.rb b/core/src/main/ruby/jruby/kernel/kernel.rb
@@ -1,5 +1,6 @@
 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)