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: 8d45787dec36
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d77153327884
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 6, 2017

  1. PERFORMANCE: Smaller bytecode for interface impl returns

    @original-brownbear
    original-brownbear committed Sep 6, 2017
    Copy the full SHA
    3613060 View commit details

Commits on Sep 7, 2017

  1. Merge pull request #4780 from original-brownbear/smaller-bytecode-return 

    PERFORMANCE: Smaller bytecode for interface impl returns
    @headius
    headius authored Sep 7, 2017
    Copy the full SHA
    d771533 View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 core/src/main/java/org/jruby/java/codegen/RealClassGenerator.java
9 changes: 6 additions & 3 deletions core/src/main/java/org/jruby/java/codegen/RealClassGenerator.java
View file
Original file line number Diff line number Diff line change
@@ -817,9 +817,12 @@ public static void coerceResultAndReturn(SkinnyMethodAdapter mv, Class returnTyp
}
}
} else {
mv.ldc(Type.getType(returnType));
mv.invokeinterface(p(IRubyObject.class), "toJava", sig(Object.class, Class.class));
mv.checkcast(p(returnType));
if (!IRubyObject.class.isAssignableFrom(returnType)) {
mv.ldc(Type.getType(returnType));
mv.invokeinterface(
p(IRubyObject.class), "toJava", sig(Object.class, Class.class));
mv.checkcast(p(returnType));
}
mv.areturn();
}
} else {