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

Commits on Mar 5, 2015

  1. [Truffle] next keyword is fine for compilation.

    @chrisseaton
    chrisseaton committed Mar 5, 2015
    Copy the full SHA
    7f7e1ce View commit details

  2. [Truffle] Need a boundary on force encoding if we're going to look up… 

    … the encoding by name.
    @chrisseaton
    chrisseaton committed Mar 5, 2015
    Copy the full SHA
    dc9c8e6 View commit details
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/control/NextNode.java
View file
Original file line number Diff line number Diff line change
@@ -27,8 +27,6 @@ public NextNode(RubyContext context, SourceSection sourceSection, RubyNode child

@Override
public Object execute(VirtualFrame frame) {
notDesignedForCompilation();

throw new NextException(child.execute(frame));
}

1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -1009,6 +1009,7 @@ public ForceEncodingNode(ForceEncodingNode prev) {
super(prev);
}

@TruffleBoundary
@Specialization
public RubyString forceEncoding(RubyString string, RubyString encodingName) {
final RubyEncoding encoding = RubyEncoding.getEncoding(encodingName.toString());