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

Commits on Oct 7, 2014

  1. Ensure scope flags get computed before JIT.

    @headius
    headius committed Oct 7, 2014
    Copy the full SHA
    d5af5d4 View commit details

  2. Turn off background JIT until IR is thread-safe.

    @headius
    headius committed Oct 7, 2014
    Copy the full SHA
    cb74489 View commit details
Showing with 4 additions and 1 deletion.
  1. +2 −0 core/src/main/java/org/jruby/ir/IRScope.java
  2. +2 −1 core/src/main/java/org/jruby/util/cli/Options.java
2 changes: 2 additions & 0 deletions core/src/main/java/org/jruby/ir/IRScope.java
View file
Original file line number Diff line number Diff line change
@@ -665,6 +665,8 @@ public synchronized List<BasicBlock> prepareForCompilation() {

prepareInstructions();

computeScopeFlags();

return buildLinearization();
}

3 changes: 2 additions & 1 deletion core/src/main/java/org/jruby/util/cli/Options.java
View file
Original file line number Diff line number Diff line change
@@ -112,7 +112,8 @@ public class Options {
public static final Option<String> JIT_EXCLUDE = string(JIT, "jit.exclude", new String[]{"ClsOrMod","ClsOrMod::method_name","-::method_name"}, "", "Exclude methods from JIT. Comma delimited.");
public static final Option<String> JIT_CODECACHE = string(JIT, "jit.codeCache", new String[]{"dir"}, "Save jitted methods to <dir> as they're compiled, for future runs.");
public static final Option<Boolean> JIT_DEBUG = bool(JIT, "jit.debug", false, "Log loading of JITed bytecode.");
public static final Option<Boolean> JIT_BACKGROUND = bool(JIT, "jit.background", true, "Run the JIT compiler in a background thread.");
// CON FIXME: IR is not thread-safe yet, so turn off background JIT for now
public static final Option<Boolean> JIT_BACKGROUND = bool(JIT, "jit.background", false, "Run the JIT compiler in a background thread.");

public static final Option<Boolean> IR_DEBUG = bool(IR, "ir.debug", false, "Debug generation of JRuby IR.");
public static final Option<Boolean> IR_PROFILE = bool(IR, "ir.profile", false, "[EXPT]: Profile IR code during interpretation.");