Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e4ea70d8518
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 222f2f4101ae
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 14, 2017

  1. Copy the full SHA
    570e783 View commit details
  2. Copy the full SHA
    222f2f4 View commit details
Showing with 54 additions and 56 deletions.
  1. +14 −16 spec/compiler/general_spec.rb
  2. +40 −40 spec/java_integration/types/coercion_spec.rb
30 changes: 14 additions & 16 deletions spec/compiler/general_spec.rb
Original file line number Diff line number Diff line change
@@ -43,38 +43,36 @@ def self.name; "jit"; end

def compile_to_method(src, filename, lineno)
node = JRuby.parse(src, filename, false, lineno)
oj = org.jruby
runtime = JRuby.runtime

# This logic is a mix of logic from InterpretedIRMethod's JIT, o.j.Ruby's script compilation, and IRScriptBody's
# interpret. We need to figure out a cleaner path.

scope = node.getStaticScope
currModule = scope.getModule
if currModule == nil
currModule = JRuby.runtime.top_self.class
scope.setModule(currModule)
scope.setModule currModule = runtime.top_self.class
end

method = oj.ir.IRBuilder.build_root(JRuby.runtime.getIRManager(), node).scope
method = org.jruby.ir.IRBuilder.build_root(runtime.getIRManager(), node).scope
method.prepareForCompilation

compiler = oj.ir.targets.JVMVisitor.new
compiled = compiler.compile(method, oj.util.OneShotClassLoader.new(JRuby.runtime.getJRubyClassLoader()))
scriptMethod = compiled.getMethod(
"RUBY$script",
oj.runtime.ThreadContext.java_class,
oj.parser.StaticScope.java_class,
oj.runtime.builtin.IRubyObject.java_class,
oj.runtime.builtin.IRubyObject[].java_class,
oj.runtime.Block.java_class,
oj.RubyModule.java_class,
compiler = org.jruby.ir.targets.JVMVisitor.new(runtime)
compiled = compiler.compile(method, org.jruby.util.OneShotClassLoader.new(runtime.getJRubyClassLoader()))
scriptMethod = compiled.getMethod("RUBY$script",
org.jruby.runtime.ThreadContext.java_class,
org.jruby.parser.StaticScope.java_class,
org.jruby.runtime.builtin.IRubyObject.java_class,
org.jruby.runtime.builtin.IRubyObject[].java_class,
org.jruby.runtime.Block.java_class,
org.jruby.RubyModule.java_class,
java.lang.String.java_class)
handle = java.lang.invoke.MethodHandles.publicLookup().unreflect(scriptMethod)

return oj.internal.runtime.methods.CompiledIRMethod.new(
return org.jruby.internal.runtime.methods.CompiledIRMethod.new(
handle,
method,
oj.runtime.Visibility::PUBLIC,
org.jruby.runtime.Visibility::PUBLIC,
currModule,
false)
end
80 changes: 40 additions & 40 deletions spec/java_integration/types/coercion_spec.rb
Original file line number Diff line number Diff line change
@@ -14,15 +14,15 @@
expect(CoreTypeMethods.getString).to be_kind_of(String)
expect(CoreTypeMethods.getString).to eq("foo");

expect(CoreTypeMethods.getByte).to be_kind_of(Fixnum)
expect(CoreTypeMethods.getByte).to be_kind_of(Integer)
expect(CoreTypeMethods.getByte).to eq(1)
expect(CoreTypeMethods.getShort).to be_kind_of(Fixnum)
expect(CoreTypeMethods.getShort).to be_kind_of(Integer)
expect(CoreTypeMethods.getShort).to eq(2)
expect(CoreTypeMethods.getChar).to be_kind_of(Fixnum)
expect(CoreTypeMethods.getChar).to be_kind_of(Integer)
expect(CoreTypeMethods.getChar).to eq(2)
expect(CoreTypeMethods.getInt).to be_kind_of(Fixnum)
expect(CoreTypeMethods.getInt).to be_kind_of(Integer)
expect(CoreTypeMethods.getInt).to eq(4)
expect(CoreTypeMethods.getLong).to be_kind_of(Fixnum)
expect(CoreTypeMethods.getLong).to be_kind_of(Integer)
expect(CoreTypeMethods.getLong).to eq(8)

expect(CoreTypeMethods.getFloat).to be_kind_of(Float)
@@ -224,15 +224,15 @@
expect(JavaFields.stringStaticField).to be_kind_of(String)
expect(JavaFields.stringStaticField).to eq("foo");

expect(JavaFields.byteStaticField).to be_kind_of(Fixnum)
expect(JavaFields.byteStaticField).to be_kind_of(Integer)
expect(JavaFields.byteStaticField).to eq(1)
expect(JavaFields.shortStaticField).to be_kind_of(Fixnum)
expect(JavaFields.shortStaticField).to be_kind_of(Integer)
expect(JavaFields.shortStaticField).to eq(2)
expect(JavaFields.charStaticField).to be_kind_of(Fixnum)
expect(JavaFields.charStaticField).to be_kind_of(Integer)
expect(JavaFields.charStaticField).to eq(2)
expect(JavaFields.intStaticField).to be_kind_of(Fixnum)
expect(JavaFields.intStaticField).to be_kind_of(Integer)
expect(JavaFields.intStaticField).to eq(4)
expect(JavaFields.longStaticField).to be_kind_of(Fixnum)
expect(JavaFields.longStaticField).to be_kind_of(Integer)
expect(JavaFields.longStaticField).to eq(8)

expect(JavaFields.floatStaticField).to be_kind_of(Float)
@@ -258,15 +258,15 @@
expect(jf.stringField).to be_kind_of(String)
expect(jf.stringField).to eq("foo");

expect(jf.byteField).to be_kind_of(Fixnum)
expect(jf.byteField).to be_kind_of(Integer)
expect(jf.byteField).to eq(1)
expect(jf.shortField).to be_kind_of(Fixnum)
expect(jf.shortField).to be_kind_of(Integer)
expect(jf.shortField).to eq(2)
expect(jf.charField).to be_kind_of(Fixnum)
expect(jf.charField).to be_kind_of(Integer)
expect(jf.charField).to eq(2)
expect(jf.intField).to be_kind_of(Fixnum)
expect(jf.intField).to be_kind_of(Integer)
expect(jf.intField).to eq(4)
expect(jf.longField).to be_kind_of(Fixnum)
expect(jf.longField).to be_kind_of(Integer)
expect(jf.longField).to eq(8)

expect(jf.floatField).to be_kind_of(Float)
@@ -292,15 +292,15 @@
describe "Java primitive-box-typed fields" do
it "coerce to Ruby types when retrieved" do
# static
expect(JavaFields.byteObjStaticField).to be_kind_of(Fixnum)
expect(JavaFields.byteObjStaticField).to be_kind_of(Integer)
expect(JavaFields.byteObjStaticField).to eq(1)
expect(JavaFields.shortObjStaticField).to be_kind_of(Fixnum)
expect(JavaFields.shortObjStaticField).to be_kind_of(Integer)
expect(JavaFields.shortObjStaticField).to eq(2)
expect(JavaFields.charObjStaticField).to be_kind_of(Fixnum)
expect(JavaFields.charObjStaticField).to be_kind_of(Integer)
expect(JavaFields.charObjStaticField).to eq(2)
expect(JavaFields.intObjStaticField).to be_kind_of(Fixnum)
expect(JavaFields.intObjStaticField).to be_kind_of(Integer)
expect(JavaFields.intObjStaticField).to eq(4)
expect(JavaFields.longObjStaticField).to be_kind_of(Fixnum)
expect(JavaFields.longObjStaticField).to be_kind_of(Integer)
expect(JavaFields.longObjStaticField).to eq(8)

expect(JavaFields.floatObjStaticField).to be_kind_of(Float)
@@ -315,15 +315,15 @@

# instance
jf = JavaFields.new
expect(jf.byteObjField).to be_kind_of(Fixnum)
expect(jf.byteObjField).to be_kind_of(Integer)
expect(jf.byteObjField).to eq(1)
expect(jf.shortObjField).to be_kind_of(Fixnum)
expect(jf.shortObjField).to be_kind_of(Integer)
expect(jf.shortObjField).to eq(2)
expect(jf.charObjField).to be_kind_of(Fixnum)
expect(jf.charObjField).to be_kind_of(Integer)
expect(jf.charObjField).to eq(2)
expect(jf.intObjField).to be_kind_of(Fixnum)
expect(jf.intObjField).to be_kind_of(Integer)
expect(jf.intObjField).to eq(4)
expect(jf.longObjField).to be_kind_of(Fixnum)
expect(jf.longObjField).to be_kind_of(Integer)
expect(jf.longObjField).to eq(8)

expect(jf.floatObjField).to be_kind_of(Float)
@@ -377,23 +377,23 @@ def receiveLongAndDouble(l, d)

expect(vri_handler.receiveByte(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveShort(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveChar(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveInt(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveLong(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveFloat(obj)).to eq(obj)
expect(vri.result).to eq(obj)
@@ -442,23 +442,23 @@ def receive_primitive(obj)

expect(vri_handler.receiveByte(nil)).to eq(0)
expect(vri.result).to eq(0)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveShort(nil)).to eq(0)
expect(vri.result).to eq(0)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveChar(nil)).to eq(0)
expect(vri.result).to eq(0)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveInt(nil)).to eq(0)
expect(vri.result).to eq(0)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveLong(nil)).to eq(0)
expect(vri.result).to eq(0)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveFloat(nil)).to eq(0.0)
expect(vri.result).to eq(0.0)
@@ -504,23 +504,23 @@ def receiveByte(obj)

expect(vri_handler.receiveByteObj(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveShortObj(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveCharObj(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveIntObj(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveLongObj(obj)).to eq(obj)
expect(vri.result).to eq(obj)
expect(vri.result.class).to eq(Fixnum)
expect(vri.result.class).to eq(Integer)

expect(vri_handler.receiveFloatObj(obj)).to eq(obj)
expect(vri.result).to eq(obj)