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

Commits on Dec 20, 2014

  1. [Truffle] Fix merge.

    @chrisseaton
    chrisseaton committed Dec 20, 2014
    Copy the full SHA
    d1408fc View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -358,7 +358,7 @@ public int count(VirtualFrame frame, RubyString string, Object[] otherStrings) {
return countSlow(frame, string, otherStrings);
}

@CompilerDirectives.SlowPath
@CompilerDirectives.TruffleBoundary
private int countSlow(VirtualFrame frame, RubyString string, Object[] args) {
RubyString[] otherStrings = new RubyString[args.length];