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

Commits on Nov 15, 2014

  1. [Truffle] Add TruffleBoundary to RubyString.toString().

    @bpot
    bpot committed Nov 15, 2014
    Copy the full SHA
    9ba7cc8 View commit details

Commits on Nov 29, 2014

  1. Merge pull request #2200 from bpot/truffle_to_string_boundary 

    [Truffle] Add TruffleBoundary to RubyString.toString().
    @chrisseaton
    chrisseaton committed Nov 29, 2014
    Copy the full SHA
    13629b8 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 core/src/main/java/org/jruby/truffle/runtime/core/RubyString.java
2 changes: 2 additions & 0 deletions core/src/main/java/org/jruby/truffle/runtime/core/RubyString.java
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
*/
package org.jruby.truffle.runtime.core;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import org.jcodings.Encoding;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.runtime.Helpers;
@@ -140,6 +141,7 @@ public boolean equals(Object other) {
}

@Override
@TruffleBoundary
public String toString() {
RubyNode.notDesignedForCompilation();