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

Commits on Jan 11, 2017

  1. Copy the full SHA
    56449bc View commit details
  2. Revert "[Truffle] Enable lazy translation."

    This reverts commit 8af8fc0.
    chrisseaton committed Jan 11, 2017
    Copy the full SHA
    d88850c View commit details
Showing with 2 additions and 3 deletions.
  1. +1 −1 tool/truffle/options.yml
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/options/OptionsCatalog.java
  3. +0 −1 truffle/src/test/ruby/factorial.rb
2 changes: 1 addition & 1 deletion tool/truffle/options.yml
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ INLINE_JS: [inline_js, boolean, false, Allow inline JavaScript]

CORE_LOAD_PATH: [core.load_path, string, 'truffle:/jruby-truffle', Location to load the Truffle core library from]
CORE_PARALLEL_LOAD: [core.parallel_load, boolean, false, Load the Truffle core library in parallel]
LAZY_TRANSLATION: [lazy_translation, boolean, true, Lazily translate from the parser AST to the Truffle AST]
LAZY_TRANSLATION: [lazy_translation, boolean, false, Lazily translate from the parser AST to the Truffle AST]
LAZY_TRANSLATION_LOG: [lazy_translation.log, boolean, false, Log lazy translations from the parser AST to the Truffle AST]

ARRAY_UNINITIALIZED_SIZE: [array.uninitialized_size, integer, 32, How large an Array to allocate when we have no other information to go on]
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ public class OptionsCatalog {
public static final OptionDescription INLINE_JS = new BooleanOptionDescription("inline_js", "Allow inline JavaScript", false);
public static final OptionDescription CORE_LOAD_PATH = new StringOptionDescription("core.load_path", "Location to load the Truffle core library from", "truffle:/jruby-truffle");
public static final OptionDescription CORE_PARALLEL_LOAD = new BooleanOptionDescription("core.parallel_load", "Load the Truffle core library in parallel", false);
public static final OptionDescription LAZY_TRANSLATION = new BooleanOptionDescription("lazy_translation", "Lazily translate from the parser AST to the Truffle AST", true);
public static final OptionDescription LAZY_TRANSLATION = new BooleanOptionDescription("lazy_translation", "Lazily translate from the parser AST to the Truffle AST", false);
public static final OptionDescription LAZY_TRANSLATION_LOG = new BooleanOptionDescription("lazy_translation.log", "Log lazy translations from the parser AST to the Truffle AST", false);
public static final OptionDescription ARRAY_UNINITIALIZED_SIZE = new IntegerOptionDescription("array.uninitialized_size", "How large an Array to allocate when we have no other information to go on", 32);
public static final OptionDescription ARRAY_SMALL = new IntegerOptionDescription("array.small", "Maximum size of an Array to consider small for optimisations", 3);
1 change: 0 additions & 1 deletion truffle/src/test/ruby/factorial.rb
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ def fac(n)

def main
res = fac(2)
puts res
res
end
Truffle::Interop.export_method(:main)