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

Commits on Apr 30, 2015

  1. [Truffle] Give RubyBasicObject a helpful toString for debugging.

    @chrisseaton
    chrisseaton committed Apr 30, 2015
    Copy the full SHA
    99feebe View commit details

  2. [Truffle] If there is a fatal error, just transfer - don't profile an… 

    …d notDesigned.
    @chrisseaton
    chrisseaton committed Apr 30, 2015
    Copy the full SHA
    9c67c8c View commit details
7 changes: 2 additions & 5 deletions truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
View file
Original file line number Diff line number Diff line change
@@ -53,8 +53,6 @@ public class RubyCallNode extends RubyNode {

@Child private CallDispatchHeadNode dispatchHead;

private final BranchProfile splatNotArrayProfile = BranchProfile.create();

@CompilerDirectives.CompilationFinal private boolean seenNullInUnsplat = false;
@CompilerDirectives.CompilationFinal private boolean seenIntegerFixnumInUnsplat = false;
@CompilerDirectives.CompilationFinal private boolean seenLongFixnumInUnsplat = false;
@@ -192,9 +190,8 @@ private Object[] splat(Object argument) {
// TODO(CS): what happens if isn't just one argument, or it isn't an Array?

if (!(argument instanceof RubyArray)) {
splatNotArrayProfile.enter();
notDesignedForCompilation();
throw new UnsupportedOperationException();
CompilerDirectives.transferToInterpreter();
throw new UnsupportedOperationException(argument.toString());
}

final RubyArray array = (RubyArray) argument;
6 changes: 6 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/runtime/core/RubyBasicObject.java
View file
Original file line number Diff line number Diff line change
@@ -231,4 +231,10 @@ public RubyBasicObject allocate(RubyContext context, RubyClass rubyClass, Node c

}

@Override
public String toString() {
CompilerAsserts.neverPartOfCompilation("should never use RubyBasicObject#toString to implement Ruby functionality");
return String.format("RubyBasicObject@%x<logicalClass=%s>", System.identityHashCode(this), logicalClass.getName());
}

}