Merge branch 'master' into truffle-head

jruby · Nov 24, 2015 · 8607b5a · 8607b5a
2 parents 19457f5 + 8a70890
commit 8607b5a
Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -241,7 +241,7 @@ public class Options {
     public static final Option<Integer> TRUFFLE_ALLOCATE_CLASS_CACHE = integer(TRUFFLE, "truffle.allocate_class.cache", TRUFFLE_DEFAULT_CACHE.load(), "Allocation size class cache size");
     public static final Option<Integer> TRUFFLE_PACK_CACHE = integer(TRUFFLE, "truffle.pack.cache", TRUFFLE_DEFAULT_CACHE.load(), "Array#pack cache size");
     public static final Option<Integer> TRUFFLE_EVAL_CACHE = integer(TRUFFLE, "truffle.eval.cache", TRUFFLE_DEFAULT_CACHE.load(), "eval lookup cache size");
-    public static final Option<Integer> ENCODING_COMPATIBILE_QUERY_CACHE = integer(TRUFFLE, "truffle.encoding_comptabile_query.cache", TRUFFLE_DEFAULT_CACHE.load(), "Encoding.compatible? cache size");
+    public static final Option<Integer> ENCODING_COMPATIBLE_QUERY_CACHE = integer(TRUFFLE, "truffle.encoding_compatible_query.cache", TRUFFLE_DEFAULT_CACHE.load(), "Encoding.compatible? cache size");
 
     public static final Option<Boolean> TRUFFLE_CLONE_DEFAULT = bool(TRUFFLE, "truffle.clone.default", true, "Default option for cloning.");
     public static final Option<Boolean> TRUFFLE_INLINE_DEFAULT = bool(TRUFFLE, "truffle.inline.default", true, "Default option for inlining.");

diff --git a/lib/ruby/truffle/jruby+truffle/runner.rb b/lib/ruby/truffle/jruby+truffle/runner.rb
@@ -52,7 +52,7 @@ class JRubyTruffleRunner
                                   '-J-agentlib:jdwp=transport=dt_socket,server=y,address=%d,suspend=y'],
             truffle_bundle_path: ['--truffle-bundle-path NAME', 'Bundle path', assign_new_value, '.jruby+truffle_bundle'],
             interpreter_path:    ['--interpreter-path PATH', "Path to #{BRANDING} interpreter executable", assign_new_value,
-                                  File.expand_path(File.join(File.dirname(__FILE__), '../../../../../jruby/bin/jruby'))],
+                                  File.expand_path(File.join(File.dirname(__FILE__), '../../../../bin/jruby'))],
             graal_path:          ['--graal-path PATH', 'Path to Graal', assign_new_value, '../graalvm-jdk1.8.0/bin/java'],
             mock_load_path:      ['--mock-load-path PATH',
                                   'Path of mocks & monkey-patches (prepended in $:, relative to --truffle_bundle_path)',

diff --git a/spec/truffle/tags/core/time/at_tags.txt b/spec/truffle/tags/core/time/at_tags.txt
@@ -3,3 +3,4 @@ fails:Time.at passed Time returns a subclass instance
 fails:Time.at passed [Integer, Numeric] returns a Time object representing the given number of seconds and Float microseconds since 1970-01-01 00:00:00 UTC
 fails(travis):Time.at passed Numeric returns a non-UTC Time
 fails(travis):Time.at passed Time returns a non-UTC time if the argument is non-UTC
+fails:Time.at passed Numeric roundtrips a Rational produced by #to_r
diff --git a/test/check_versions.sh b/test/check_versions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Checks that the artefacts produced by the JRuby build system have the correct
-# names and versions.
+# names and versions, and have reasonable sizes.
 
 jar_version=`cat VERSION`
 gem_version=${jar_version/-/.}
@@ -68,7 +68,7 @@ check maven/jruby-jars/lib/jruby-stdlib-$jar_version.jar 8
 check maven/jruby-complete/target/jruby-complete-$jar_version.jar 27
 check maven/jruby/target/jruby-$jar_version.jar 9
 check maven/jruby-dist/target/jruby-dist-$jar_version-bin.tar.gz 45 jruby-$jar_version
-check maven/jruby-dist/target/jruby-dist-$jar_version-bin200.tar.gz 19 jruby-$jar_version
+check maven/jruby-dist/target/jruby-dist-$jar_version-bin200.tar.gz 20 jruby-$jar_version
 check maven/jruby-dist/target/jruby-dist-$jar_version-src.zip 14 jruby-$jar_version
 check maven/jruby-dist/target/jruby-dist-$jar_version-bin.zip 45 jruby-$jar_version
 check core/target/jruby-core-$jar_version.jar 9

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/Options.java b/truffle/src/main/java/org/jruby/truffle/runtime/Options.java
@@ -42,7 +42,7 @@ public class Options {
     public final int ALLOCATE_CLASS_CACHE = org.jruby.util.cli.Options.TRUFFLE_ALLOCATE_CLASS_CACHE.load();
     public final int PACK_CACHE = org.jruby.util.cli.Options.TRUFFLE_PACK_CACHE.load();
     public final int EVAL_CACHE = org.jruby.util.cli.Options.TRUFFLE_EVAL_CACHE.load();
-    public final int ENCODING_COMPATIBILE_QUERY_CACHE = org.jruby.util.cli.Options.ENCODING_COMPATIBILE_QUERY_CACHE.load();
+    public final int ENCODING_COMPATIBILE_QUERY_CACHE = org.jruby.util.cli.Options.ENCODING_COMPATIBLE_QUERY_CACHE.load();
 
     // Cloning and inlining
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/methods/SharedMethodInfo.java b/truffle/src/main/java/org/jruby/truffle/runtime/methods/SharedMethodInfo.java
@@ -41,7 +41,7 @@ public SharedMethodInfo(SourceSection sourceSection, LexicalScope lexicalScope,
         this.arity = arity;
         this.name = name;
         this.isBlock = isBlock;
-        this.argumentDescriptors = argumentDescriptors;
+        this.argumentDescriptors = argumentDescriptors == null ? new ArgumentDescriptor[] {} : argumentDescriptors;
         this.alwaysClone = alwaysClone;
         this.alwaysInline = alwaysInline;
         this.needsCallerFrame = needsCallerFrame;