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: 973fe1ed505c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c3a6e013f90
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 4, 2018

  1. Another spelling fix from specs.

    @headius
    headius committed Jan 4, 2018
    Copy the full SHA
    dc8ecd1 View commit details

  2. If we push, always pop.

    @headius
    headius committed Jan 4, 2018
    Copy the full SHA
    5c3a6e0 View commit details
6 changes: 4 additions & 2 deletions core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRBodyMethod.java
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,9 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
protected IRubyObject callInternal(ThreadContext context, IRubyObject self, RubyModule clazz, String name, Block block) {
InterpreterContext ic = ensureInstrsReady();

if (!ic.hasExplicitCallProtocol()) this.pre(ic, context, self, name, block, getImplementationClass());
boolean hasExplicitCallProtocol = ic.hasExplicitCallProtocol();

if (!hasExplicitCallProtocol) this.pre(ic, context, self, name, block, getImplementationClass());

try {
switch (method.getScopeType()) {
@@ -50,7 +52,7 @@ protected IRubyObject callInternal(ThreadContext context, IRubyObject self, Ruby
default: throw new RuntimeException("invalid body method type: " + method);
}
} finally {
if (!ic.hasExplicitCallProtocol()) this.post(ic, context);
if (!hasExplicitCallProtocol) this.post(ic, context);
}
}

2 changes: 1 addition & 1 deletion spec/tags/ruby/core/exception/signal_exception_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
critical(crash):rescueing SignalException raises a SignalException when sent a signal
critical(crash):rescuing SignalException raises a SignalException when sent a signal