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

Commits on Jun 23, 2015

  1. [Truffle] Raise a range error when using a Bignum as an array index.

    @nirvdrum
    nirvdrum committed Jun 23, 2015
    Copy the full SHA
    3df7774 View commit details

  2. [Truffle] More StringScanner specs passing.

    @nirvdrum
    nirvdrum committed Jun 23, 2015
    Copy the full SHA
    f8eef82 View commit details
1 change: 0 additions & 1 deletion spec/truffle/tags/library/stringscanner/peek_tags.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion spec/truffle/tags/library/stringscanner/peep_tags.txt
View file

This file was deleted.

9 changes: 8 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.FloatNodes;
import org.jruby.truffle.nodes.core.FloatNodesFactory;
@@ -42,6 +43,11 @@ public int doInt(VirtualFrame frame, Object object) {
return (int) integerObject;
}

if (RubyGuards.isRubyBignum(object)) {
CompilerDirectives.transferToInterpreter();
throw new RaiseException(getContext().getCoreLibrary().rangeError("bignum too big to convert into `long'", this));
}

CompilerDirectives.transferToInterpreter();
throw new UnsupportedOperationException();
}
@@ -60,7 +66,8 @@ public long coerceLong(long value) {

@Specialization(guards = "isRubyBignum(value)")
public RubyBasicObject coerceRubyBignum(RubyBasicObject value) {
return value;
CompilerDirectives.transferToInterpreter();
throw new RaiseException(getContext().getCoreLibrary().rangeError("bignum too big to convert into `long'", this));
}

@Specialization