jruby · Mar 11, 2015 · Mar 11, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -70,7 +70,6 @@ matrix:
   allow_failures:
     - env: PHASE='-Pcomplete'
     - env: PHASE='-Pmain'
-    - env: PHASE='-Prake -Dtask=spec:jrubyc'
     - env: PHASE='-Prake -Dtask=spec:profiler'
     - env: PHASE='-Prake -Dtask=test:mri:jit'
 

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRWriter.java b/core/src/main/java/org/jruby/ir/persistence/IRWriter.java
@@ -34,8 +34,10 @@ public static void persist(IRWriterEncoder file, IRScope script) throws IOExcept
     private static void persistScopeInstructions(IRWriterEncoder file, IRScope parent) {
         persistScopeInstrs(file, parent);
 
-        for (IRScope scope: parent.getLexicalScopes()) {
-            persistScopeInstructions(file, scope);
+        if (parent.getLexicalScopes() != null) {
+            for (IRScope scope: parent.getLexicalScopes()) {
+                persistScopeInstructions(file, scope);
+            }
         }
     }
 
@@ -60,8 +62,10 @@ private static void persistScopeInstrs(IRWriterEncoder file, IRScope scope) {
     private static void persistScopeHeaders(IRWriterEncoder file, IRScope parent) {
         persistScopeHeader(file, parent);
 
-        for (IRScope scope: parent.getLexicalScopes()) {
-            persistScopeHeaders(file, scope);
+        if (parent.getLexicalScopes() != null) {
+            for (IRScope scope : parent.getLexicalScopes()) {
+                persistScopeHeaders(file, scope);
+            }
         }
     }
 

diff --git a/core/src/main/ruby/jruby/jruby.rb b/core/src/main/ruby/jruby/jruby.rb
@@ -62,17 +62,21 @@ def parse(content = nil, filename = (default_filename = true; '-'), extra_positi
     end
     alias ast_for parse
 
+    def compile_ir(content = nil, filename = (default_filename = true; '-'), extra_position_info = false, &block)
+      runtime = JRuby.runtime
+      node = if default_filename
+               parse(content, &block)
+             else
+               parse(content, filename, extra_position_info, &block)
+             end
+
+      org.jruby.ir.IRBuilder.build_root(runtime.getIRManager(), node).scope
+    end
+
     # Parse and compile the given block or provided content, returning a new
     # CompiledScript instance.
     def compile(content = nil, filename = (default_filename = true; '-'), extra_position_info = false, &block)
-      node = if default_filename
-        parse(content, &block)
-      else
-        parse(content, filename, extra_position_info, &block)
-      end
-
-      runtime = JRuby.runtime
-      irscope = org.jruby.ir.IRBuilder.build_root(runtime.getIRManager(), node).scope
+      irscope = compile_ir(content, filename)
 
       visitor = org.jruby.ir.targets.JVMVisitor.new
       bytes = visitor.compile_to_bytecode(irscope);

diff --git a/lib/ruby/stdlib/jruby/compiler.rb b/lib/ruby/stdlib/jruby/compiler.rb
@@ -7,8 +7,7 @@
 module JRuby::Compiler
   BAIS = java.io.ByteArrayInputStream
   Mangler = org.jruby.util.JavaNameMangler
-  BytecodeCompiler = org.jruby.compiler.impl.StandardASMCompiler
-  ASTCompiler = org.jruby.compiler.ASTCompiler
+  JVMVisitor = org.jruby.ir.targets.JVMVisitor
   JavaFile = java.io.File
   MethodSignatureNode = org.jruby.ast.java_signature.MethodSignatureNode
   DEFAULT_PREFIX = ""
@@ -129,12 +128,11 @@ def compile_files_with_options(filenames, options = default_options)
           pathname = Mangler.mangle_filename_for_classpath(filename, options[:basedir], options[:prefix], true, false)
         end
 
-        inspector = org.jruby.compiler.ASTInspector.new
-
         source = file.read
-        node = runtime.parse_file(BAIS.new(source.to_java_bytes), filename, nil)
 
         if options[:java] || options[:javac]
+          node = runtime.parse_file(BAIS.new(source.to_java_bytes), filename, nil)
+
           ruby_script = JavaGenerator.generate_java(node, filename)
           ruby_script.classes.each do |cls|
             java_dir = File.join(options[:target], cls.package.gsub('.', '/'))
@@ -153,17 +151,13 @@ def compile_files_with_options(filenames, options = default_options)
         else
           puts "Compiling #{filename}" if options[:verbose]
 
-          inspector.inspect(node)
+          scope = JRuby.compile_ir(source, filename)
 
-          asmCompiler = BytecodeCompiler.new(pathname.gsub(".", "/"), filename)
-          if options[:jdk5]
-            asmCompiler.java_version= 49
-          end
+          visitor = JVMVisitor.new
 
-          compiler = ASTCompiler.new
-          compiler.compile_root(node, asmCompiler, inspector)
+          bytes = visitor.compileToBytecode(scope)
 
-          class_bytes = String.from_java_bytes(asmCompiler.class_byte_array)
+          class_bytes = String.from_java_bytes(bytes)
 
           # prepare target
           class_filename = filename.sub(/(\.rb)?$/, '.class')

diff --git a/rakelib/rspec.rake b/rakelib/rspec.rake
@@ -61,4 +61,8 @@ namespace :spec do
   permute_specs "jruby", compile_flags do |t|
     t.pattern = 'spec/jruby/**/*_spec.rb'
   end
+
+  permute_specs "jrubyc", compile_flags do |t|
+    t.pattern = 'spec/jrubyc/**/*_spec.rb'
+  end
 end
diff --git a/spec/jrubyc/java/annotation_spec.rb b/spec/jrubyc/java/annotation_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../../../java_integration/spec_helper"
+require_relative "../../java_integration/spec_helper"
 require 'jruby'
 require 'jruby/compiler'
 

diff --git a/spec/jrubyc/java/basic_spec.rb b/spec/jrubyc/java/basic_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../../../java_integration/spec_helper"
+require_relative "../../java_integration/spec_helper"
 require 'rbconfig'
 require 'jruby'
 require 'jruby/compiler'

diff --git a/spec/jrubyc/java/constructor_spec.rb b/spec/jrubyc/java/constructor_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../../../java_integration/spec_helper"
+require_relative "../../java_integration/spec_helper"
 require 'jruby'
 require 'jruby/compiler'
 

diff --git a/spec/jrubyc/java/field_spec.rb b/spec/jrubyc/java/field_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../../../java_integration/spec_helper"
+require_relative "../../java_integration/spec_helper"
 require 'jruby'
 require 'jruby/compiler'
 

diff --git a/spec/jrubyc/java/implements_spec.rb b/spec/jrubyc/java/implements_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../../../java_integration/spec_helper"
+require_relative "../../java_integration/spec_helper"
 require 'jruby'
 require 'jruby/compiler'
 

diff --git a/spec/jrubyc/java/import_spec.rb b/spec/jrubyc/java/import_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../../../java_integration/spec_helper"
+require_relative "../../java_integration/spec_helper"
 require 'jruby'
 require 'jruby/compiler'
 

diff --git a/spec/jrubyc/java/method_spec.rb b/spec/jrubyc/java/method_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../../../java_integration/spec_helper"
+require_relative "../../java_integration/spec_helper"
 require 'jruby'
 require 'jruby/compiler'
 

diff --git a/spec/jrubyc/java/package_spec.rb b/spec/jrubyc/java/package_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../../../java_integration/spec_helper"
+require_relative "../../java_integration/spec_helper"
 require 'jruby'
 require 'jruby/compiler'