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

Commits on Jan 4, 2016

  1. [Truffle] Note of confusion.

    @chrisseaton
    chrisseaton committed Jan 4, 2016
    Copy the full SHA
    181837b View commit details

  2. [Truffle] Findbugs.

    @chrisseaton
    chrisseaton committed Jan 4, 2016
    Copy the full SHA
    3349126 View commit details
5 changes: 3 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
View file
Original file line number Diff line number Diff line change
@@ -67,6 +67,7 @@
import java.io.IOException;
import java.io.PrintStream;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Locale;
@@ -694,9 +695,9 @@ public CrtExterns getCrtExterns() {
}

public static void writeToFile(String fileName, String message) {
try (PrintStream stream = new PrintStream(fileName)) {
try (PrintStream stream = new PrintStream(fileName, StandardCharsets.UTF_8.name())) {
stream.println(message);
} catch (FileNotFoundException e) {
} catch (Exception e) {
e.printStackTrace();
}
}
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
View file
Original file line number Diff line number Diff line change
@@ -1483,6 +1483,7 @@ public RubyNode visitGlobalAsgnNode(org.jruby.ast.GlobalAsgnNode node) {
RubyNode assignment = localVarNode.makeWriteNode(rhs);

if (name.equals("$_")) {
// TODO CS 4-Jan-16 I can't work out why this is a *get* node
assignment = GetFromThreadLocalNodeGen.create(context, sourceSection, assignment);
}