jruby · Mar 1, 2016 · Mar 1, 2016 · Mar 1, 2016 · Mar 1, 2016 · Mar 1, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,7 @@ env:
     - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     - MALLOC_ARENA_MAX=2
   matrix:
+    - JTRCI='lib/ruby/truffle/jruby+truffle/gem_ci/travis.txt'
     - PHASE='-Ptest'
     - PHASE='-Prake -Dtask=test:jruby'
     - PHASE='-Prake -Dtask=test:jruby:fullint'
@@ -79,7 +80,7 @@ matrix:
     - env: JT=check_ambiguous_arguments
       jdk: oraclejdk8
     - env: JT='test mri'
-    - env: JTR='ci --batch ../lib/ruby/truffle/jruby+truffle/gem_ci/travis.txt'
+    - env: JTRCI='lib/ruby/truffle/jruby+truffle/gem_ci/travis.txt'
     # NOTE: build seems to never start (waited for any to finish for more than a day) - probably a travis-ci bug
     #- env: PHASE='-Pmain'
     #  sudo: required

diff --git a/lib/ruby/truffle/jruby+truffle/gem_configurations/activesupport.yaml b/lib/ruby/truffle/jruby+truffle/gem_configurations/activesupport.yaml
@@ -38,12 +38,6 @@
                 end
               end
 
-              # Work around a bug in ActiveSupport whereby it tries to pass an env hash with Symbol keys. This only
-              # works on JRuby 1.7. The following will allow the Symbol keys to coerce to Strings.
-              class Symbol
-                alias :to_str :to_s
-              end
-
     bundler.rb: "module Bundler; def self.setup; end; end"
     # mock method_source gem
     method_source.rb: nil

diff --git a/lib/ruby/truffle/jruby+truffle/lib/runner.rb b/lib/ruby/truffle/jruby+truffle/lib/runner.rb
@@ -68,13 +68,14 @@ def print_cmd(cmd, dir, print)
   BRANDING          = EXECUTABLE.include?('jruby') ? 'JRuby+Truffle' : 'RubyTruffle'
   LOCAL_CONFIG_FILE = '.jruby+truffle.yaml'
   ROOT              = Pathname(__FILE__).dirname.parent.expand_path
-  JRUBY_PATH        = (ROOT + '../../../..').expand_path
+  JRUBY_PATH        = ROOT.join('../../../..').expand_path
 
   begin
-    assign_new_value   = -> (new, old, _) { new }
-    add_to_array       = -> (new, old, _) { old << new }
-    merge_hash         = -> ((k, v), old, _) { old.merge k => v }
-    apply_pattern      = -> (pattern, old, options) do
+    assign_new_value         = -> (new, old, _) { new }
+    assign_new_negated_value = -> (new, old, _) { !new }
+    add_to_array             = -> (new, old, _) { old << new }
+    merge_hash               = -> ((k, v), old, _) { old.merge k => v }
+    apply_pattern            = -> (pattern, old, options) do
       Dir.glob(pattern) do |file|
         if options[:exclude_pattern].any? { |p| /#{p}/ =~ file }
           puts "skipped: #{file}" if verbose?
@@ -91,7 +92,7 @@ def print_cmd(cmd, dir, print)
     #                                                     -> (new_value, old_value) { result_of_this_block_is_stored },
     #                                                     default_value]
     #   }
-    OPTION_DEFINITIONS = {
+    OPTION_DEFINITIONS       = {
         global: {
             verbose:             ['-v', '--verbose', 'Run verbosely (prints options)', assign_new_value, false],
             help:                ['-h', '--help', 'Show this message', assign_new_value, false],
@@ -100,8 +101,8 @@ def print_cmd(cmd, dir, print)
                                   '-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,
-                                  JRUBY_PATH + 'bin' + 'jruby'],
-            graal_path:          ['--graal-path PATH', 'Path to Graal', assign_new_value, '../graalvm-jdk1.8.0/bin/java'],
+                                  JRUBY_PATH.join('bin', 'jruby')],
+            graal_path:          ['--graal-path PATH', 'Path to Graal', assign_new_value, (JRUBY_PATH + '../GraalVM-0.10/jre/bin/javao').to_s],
             mock_load_path:      ['--mock-load-path PATH',
                                   'Path of mocks & monkey-patches (prepended in $:, relative to --truffle_bundle_path)',
                                   assign_new_value, 'mocks'],
@@ -119,7 +120,7 @@ def print_cmd(cmd, dir, print)
         },
         run:    {
             help:            ['-h', '--help', 'Show this message', assign_new_value, false],
-            no_truffle:      ['-n', '--no-truffle', "Use conventional JRuby instead of #{BRANDING}", assign_new_value, false],
+            no_truffle:      ['-n', '--no-truffle', "Use conventional JRuby instead of #{BRANDING}", assign_new_negated_value, false],
             graal:           ['-g', '--graal', 'Run on graal', assign_new_value, false],
             build:           ['-b', '--build', 'Run `jt build` using conventional JRuby', assign_new_value, false],
             rebuild:         ['--rebuild', 'Run `jt rebuild` using conventional JRuby', assign_new_value, false],
@@ -285,7 +286,7 @@ def load_gem_configuration
 
     if candidates.size == 1
       gem_name, _ = candidates.first.split('.')
-      yaml_path   = ROOT + 'gem_configurations'+ "#{gem_name}.yaml"
+      yaml_path   = ROOT.join 'gem_configurations', "#{gem_name}.yaml"
     end
 
     apply_yaml_to_configuration(yaml_path)
@@ -334,7 +335,7 @@ def deep_merge(a, b)
 
     if Array === a
       if Array === b
-        return a.replace a + b.map { |v| eval_yaml_strings v }
+        return a.concat b.map { |v| eval_yaml_strings v }
       else
         return a
       end
@@ -366,9 +367,15 @@ def subcommand_setup(rest)
                 '--path', bundle_path,
                 *(['--without', @options[:setup][:without].join(' ')] unless @options[:setup][:without].empty?)])
 
-    link_path = "#{bundle_path}/jruby+truffle"
-    FileUtils.rm link_path if File.exist? link_path
-    execute_cmd "ln -s #{bundle_path}/#{RUBY_ENGINE} #{link_path}"
+    jruby_truffle_path = File.join(bundle_path, 'jruby+truffle')
+    FileUtils.ln_s File.join(bundle_path, RUBY_ENGINE),
+                   jruby_truffle_path,
+                   verbose: verbose? unless File.exists? jruby_truffle_path
+
+    jruby_truffle_22_path = File.join(bundle_path, 'jruby+truffle', '2.2.0')
+    FileUtils.ln_s File.join(bundle_path, 'jruby+truffle', '2.3.0'),
+                   jruby_truffle_22_path,
+                   verbose: verbose? unless File.exists? jruby_truffle_22_path
 
     mock_path = "#{bundle_path}/#{@options[:global][:mock_load_path]}"
     FileUtils.mkpath mock_path
@@ -428,12 +435,12 @@ def subcommand_run(rest)
     truffle_options = [
         ('-X+T'),
         ("-Xtruffle.core.load_path=#{core_load_path}" if @options[:global][:use_fs_core]),
-        ('-Xtruffle.exceptions.print_java=true' if @options[:run][:jexception]),
-        (format(@options[:global][:debug_option], @options[:global][:debug_port]) if @options[:run][:debug])
+        ('-Xtruffle.exceptions.print_java=true' if @options[:run][:jexception])
     ]
 
     cmd_options = [
         *(truffle_options unless @options[:run][:no_truffle]),
+        (format(@options[:global][:debug_option], @options[:global][:debug_port]) if @options[:run][:debug]),
         *ruby_options,
         '-r', "./#{@options[:global][:truffle_bundle_path]}/bundler/setup.rb",
         *@options[:run][:load_path].flat_map { |v| ['-I', v] },
@@ -459,7 +466,7 @@ def subcommand_clean(rest)
   end
 
   def subcommand_readme(rest)
-    puts File.read(ROOT + 'README.md')
+    puts File.read(ROOT.join('README.md'))
   end
 
   def subcommand_ci(rest)
@@ -520,8 +527,7 @@ def initialize(options, working_dir, gem_name)
       @options  = options
       @gem_name = gem_name
 
-      ci_file = Dir.glob(ROOT + 'gem_ci' + "#{@gem_name}.rb").first ||
-          Dir.glob(ROOT + 'gem_ci' + 'default.rb').first
+      ci_file = Dir.glob(ROOT.join('gem_ci', "{#{@gem_name},default}.rb")).first
 
       puts "Running #{ci_file}"
 
@@ -534,19 +540,19 @@ def initialize(options, working_dir, gem_name)
     end
 
     def repository_dir
-      working_dir + repository_name
+      working_dir.join repository_name
     end
 
     def testing_dir
-      repository_dir + subdir
+      repository_dir.join subdir
     end
 
     def jruby_path
       JRUBY_PATH
     end
 
     def jruby_truffle_path
-      jruby_path + 'bin' + 'jruby+truffle'
+      jruby_path.join 'bin', 'jruby+truffle'
     end
 
     def option(key)

diff --git a/tool/travis_runner.sh b/tool/travis_runner.sh
@@ -22,10 +22,10 @@ then
   ruby tool/jt.rb $JT
 fi
 
-if [[ -v JTR ]]
+if [[ -v JTRCI ]]
 then
   gem install bundler
   mkdir gem-testing
   cd gem-testing
-  jruby+truffle $JTR
+  jruby+truffle ci --batch ../$JTRCI
 fi
diff --git a/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java b/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java
@@ -38,7 +38,9 @@ public abstract class ClassNodes {
 
     private final static com.oracle.truffle.api.object.Layout LAYOUT = com.oracle.truffle.api.object.Layout.createLayout();
 
-    /** Special constructor for class Class */
+    /**
+     * Special constructor for class Class
+     */
     @TruffleBoundary
     public static DynamicObject createClassClass(RubyContext context) {
         final ModuleFields model = new ModuleFields(context, null, "Class");
@@ -199,7 +201,6 @@ public static DynamicObject createOneSingletonClass(RubyContext context, Dynamic
         return Layouts.BASIC_OBJECT.getMetaClass(rubyClass);
     }
 
-
     public static DynamicObject getSuperClass(DynamicObject rubyClass) {
         CompilerAsserts.neverPartOfCompilation();
 
@@ -262,7 +263,7 @@ void triggerInheritedHook(VirtualFrame frame, DynamicObject subClass, DynamicObj
         void moduleInitialize(VirtualFrame frame, DynamicObject rubyClass, DynamicObject block) {
             if (moduleInitializeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                moduleInitializeNode = insert(ModuleNodesFactory.InitializeNodeFactory.create(getContext(), getSourceSection(), new RubyNode[]{null,null}));
+                moduleInitializeNode = insert(ModuleNodesFactory.InitializeNodeFactory.create(getContext(), getSourceSection(), new RubyNode[]{ null, null }));
             }
             moduleInitializeNode.executeInitialize(frame, rubyClass, block);
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java
@@ -11,6 +11,7 @@
 
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
@@ -65,8 +66,7 @@ public static void debugModuleChain(DynamicObject module) {
     private final RubyContext context;
 
     public final ModuleChain start;
-    @CompilerDirectives.CompilationFinal
-    public ModuleChain parentModule;
+    @CompilationFinal public ModuleChain parentModule;
 
     public final DynamicObject lexicalParent;
     public final String givenBaseName;
@@ -134,7 +134,7 @@ public void updateAnonymousChildrenModules(RubyContext context) {
         }
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void initCopy(DynamicObject from) {
         assert RubyGuards.isRubyModule(from);
 
@@ -177,7 +177,7 @@ public void insertAfter(DynamicObject module) {
         parentModule = new IncludedModule(module, parentModule);
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void include(RubyContext context, Node currentNode, DynamicObject module) {
         assert RubyGuards.isRubyModule(module);
 
@@ -237,7 +237,7 @@ public boolean isIncludedModuleBeforeSuperClass(DynamicObject module) {
         return false;
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void prepend(RubyContext context, Node currentNode, DynamicObject module) {
         assert RubyGuards.isRubyModule(module);
 
@@ -267,7 +267,7 @@ public void prepend(RubyContext context, Node currentNode, DynamicObject module)
     /**
      * Set the value of a constant, possibly redefining it.
      */
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void setConstant(RubyContext context, Node currentNode, String name, Object value) {
         if (context.getCoreLibrary().isLoadingRubyCore()) {
             final RubyConstant currentConstant = constants.get(name);
@@ -284,7 +284,7 @@ public void setConstant(RubyContext context, Node currentNode, String name, Obje
         }
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void setAutoloadConstant(RubyContext context, Node currentNode, String name, DynamicObject filename) {
         assert RubyGuards.isRubyString(filename);
         setConstantInternal(context, currentNode, name, filename, true);
@@ -303,22 +303,22 @@ public void setConstantInternal(RubyContext context, Node currentNode, String na
         newLexicalVersion();
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public RubyConstant removeConstant(RubyContext context, Node currentNode, String name) {
         checkFrozen(context, currentNode);
         RubyConstant oldConstant = constants.remove(name);
         newLexicalVersion();
         return oldConstant;
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void setClassVariable(RubyContext context, Node currentNode, String variableName, Object value) {
         checkFrozen(context, currentNode);
 
         classVariables.put(variableName, value);
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public Object removeClassVariable(RubyContext context, Node currentNode, String name) {
         checkFrozen(context, currentNode);
 
@@ -330,7 +330,7 @@ public Object removeClassVariable(RubyContext context, Node currentNode, String
         return found;
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void addMethod(RubyContext context, Node currentNode, InternalMethod method) {
         assert ModuleOperations.canBindMethodTo(method.getDeclaringModule(), rubyModuleObject) ||
                 ModuleOperations.assignableTo(context.getCoreLibrary().getObjectClass(), method.getDeclaringModule());
@@ -352,13 +352,13 @@ public void addMethod(RubyContext context, Node currentNode, InternalMethod meth
         }
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void removeMethod(String methodName) {
         methods.remove(methodName);
         newVersion();
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void undefMethod(RubyContext context, Node currentNode, String methodName) {
         final InternalMethod method = ModuleOperations.lookupMethod(rubyModuleObject, methodName);
         if (method == null) {
@@ -372,7 +372,7 @@ public void undefMethod(RubyContext context, Node currentNode, String methodName
      * Also searches on Object for modules.
      * Used for alias_method, visibility changes, etc.
      */
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public InternalMethod deepMethodSearch(RubyContext context, String name) {
         InternalMethod method = ModuleOperations.lookupMethod(rubyModuleObject, name);
         if (method != null && !method.isUndefined()) {
@@ -391,7 +391,7 @@ public InternalMethod deepMethodSearch(RubyContext context, String name) {
         return null;
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void alias(RubyContext context, Node currentNode, String newName, String oldName) {
         InternalMethod method = deepMethodSearch(context, oldName);
 
@@ -409,7 +409,7 @@ public void alias(RubyContext context, Node currentNode, String newName, String
         addMethod(context, currentNode, aliasMethod);
     }
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public void changeConstantVisibility(RubyContext context, Node currentNode, String name, boolean isPrivate) {
         checkFrozen(context, currentNode);
         RubyConstant rubyConstant = constants.get(name);

diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleOperations.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleOperations.java
@@ -318,7 +318,7 @@ public static InternalMethod lookupSuperMethod(DynamicObject declaringModule, St
                 }
             }
         }
-        assert foundDeclaringModule : "Did not find the declaring module in "+ Layouts.MODULE.getFields(objectMetaClass).getName() +" ancestors";
+        assert foundDeclaringModule : "Did not find the declaring module in " + Layouts.MODULE.getFields(objectMetaClass).getName() + " ancestors";
 
         return null;
     }