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

Commits on May 10, 2015

  1. [Truffle] Start to simplify RubyBignum.

    @chrisseaton
    chrisseaton committed May 10, 2015
    Copy the full SHA
    deb5b79 View commit details

  2. [Truffle] Use a static accessor to get the value of a Bignum, to prep… 

    …are for dynamicisation.
    @chrisseaton
    chrisseaton committed May 10, 2015
    Copy the full SHA
    f7ed8f6 View commit details

  3. [Truffle] No need to use RubyBignum as the type of the first paramete… 

    …r in Bignum methods.
    @chrisseaton
    chrisseaton committed May 10, 2015
    Copy the full SHA
    1a23038 View commit details

  4. [Truffle] Convert lots of references to RubyBignum to guards.

    @chrisseaton
    chrisseaton committed May 10, 2015
    Copy the full SHA
    121a983 View commit details
Showing with 261 additions and 249 deletions.
  1. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java
  2. +5 −3 truffle/src/main/java/org/jruby/truffle/nodes/cast/CmpIntNode.java
  3. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/cast/HashCastNode.java
  4. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
  5. +148 −141 truffle/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
  6. +12 −12 truffle/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java
  7. +10 −9 truffle/src/main/java/org/jruby/truffle/nodes/core/GeneralDivModNode.java
  8. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/IntegerNodes.java
  9. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  10. +14 −14 truffle/src/main/java/org/jruby/truffle/nodes/core/MathNodes.java
  11. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/ObjectSpaceNodes.java
  12. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
  13. +27 −27 truffle/src/main/java/org/jruby/truffle/nodes/core/fixnum/FixnumNodes.java
  14. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/methods/AliasNode.java
  15. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/objects/FreezeNode.java
  16. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/objects/IsFrozenNode.java
  17. +3 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/BignumPrimitiveNodes.java
  18. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/FixnumPrimitiveNodes.java
  19. +5 −3 truffle/src/main/java/org/jruby/truffle/pack/nodes/type/ToLongNode.java
  20. +6 −4 truffle/src/main/java/org/jruby/truffle/pack/nodes/write/WriteBERNode.java
  21. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
  22. +5 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyBasicObject.java
  23. +2 −10 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyBignum.java
  24. +3 −2 truffle/src/main/java/org/jruby/truffle/runtime/object/ObjectIDOperations.java
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -68,8 +68,8 @@ public RubyBasicObject cast(double value) {
return nil();
}

@Specialization
public RubyBasicObject cast(RubyBignum value) {
@Specialization(guards = "isRubyBignum(value)")
public RubyBasicObject cast(RubyBasicObject value) {
return nil();
}

8 changes: 5 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/cast/CmpIntNode.java
View file
Original file line number Diff line number Diff line change
@@ -27,10 +27,12 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.BignumNodes;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.core.RubyBignum;
import org.jruby.truffle.runtime.core.RubyString;

@@ -80,9 +82,9 @@ public int cmpLong(long value, Object receiver, Object other) {
return 0;
}

@Specialization
public int cmpBignum(RubyBignum value, Object receiver, Object other) {
return value.bigIntegerValue().signum();
@Specialization(guards = "isRubyBignum(value)")
public int cmpBignum(RubyBasicObject value, Object receiver, Object other) {
return BignumNodes.getBigIntegerValue(value).signum();
}

@Specialization(guards = "isNil(nil)")
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/cast/HashCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -59,8 +59,8 @@ public RubyBasicObject cast(double value) {
return nil();
}

@Specialization
public RubyBasicObject cast(RubyBignum value) {
@Specialization(guards = "isRubyBignum(value)")
public RubyBasicObject cast(RubyBasicObject value) {
return nil();
}

4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/coerce/ToIntNode.java
View file
Original file line number Diff line number Diff line change
@@ -59,8 +59,8 @@ public long coerceLong(long value) {
return value;
}

@Specialization
public RubyBignum coerceRubyBignum(RubyBignum value) {
@Specialization(guards = "isRubyBignum(value)")
public RubyBasicObject coerceRubyBignum(RubyBasicObject value) {
return value;
}

Loading