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

Commits on May 2, 2016

  1. Show exits from current block to others in print output.

    @headius
    headius committed May 2, 2016
    Copy the full SHA
    cb3e0e5 View commit details

  2. Remove commented-out workaround for Java 1.5 bug.

    @headius
    headius committed May 2, 2016
    Copy the full SHA
    d9c8103 View commit details
Showing with 20 additions and 10 deletions.
  1. +0 −9 core/src/main/java/org/jruby/ext/socket/RubyUDPSocket.java
  2. +20 −1 core/src/main/java/org/jruby/ir/persistence/IRDumper.java
9 changes: 0 additions & 9 deletions core/src/main/java/org/jruby/ext/socket/RubyUDPSocket.java
View file
Original file line number Diff line number Diff line change
@@ -172,15 +172,6 @@ else if (host instanceof RubyFixnum) {
catch (IOException e) {
throw sockerr(runtime, "bind: name or service not known", e);
}
//catch (Error e) {
// // Workaround for a bug in Sun's JDK 1.5.x, see
// // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6303753
// if (e.getCause() instanceof SocketException) {
// throw SocketUtils.sockerr(runtime, "bind: name or service not known");
// } else {
// throw e;
// }
//}
}

@JRubyMethod
21 changes: 20 additions & 1 deletion core/src/main/java/org/jruby/ir/persistence/IRDumper.java
View file
Original file line number Diff line number Diff line change
@@ -168,7 +168,26 @@ public void visit(IRScope scope, boolean full, boolean recurse) {
BasicBlock[] bbs = ((FullInterpreterContext)ic).getLinearizedBBList();

for (BasicBlock bb : bbs) {
printAnsi(BLOCK_COLOR, "\nbasic_block #" + bb.getID() + ": " + bb.getLabel() + "\n");
printAnsi(BLOCK_COLOR, "\nblock #" + bb.getID());

Iterable<BasicBlock> outs;
if (scope.getCFG() != null &&
(outs = scope.getCFG().getOutgoingDestinations(bb)) != null &&
outs.iterator().hasNext()) {

printAnsi(BLOCK_COLOR, " (out: ");

boolean first = true;
for (BasicBlock out : outs) {
if (!first) printAnsi(BLOCK_COLOR, ",");
first = false;
printAnsi(BLOCK_COLOR, "" + out.getID());
}

printAnsi(BLOCK_COLOR, ")");
}

printAnsi(BLOCK_COLOR, ": " + bb.getLabel() + "\n");

List<Instr> instrList = bb.getInstrs();