Merge branch 'master' into truffle-head

Conflicts: truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java truffle/src/main/java/org/jruby/truffle/nodes/interop/InteropNode.java
jruby · Jun 12, 2015 · cba68fd · cba68fd
2 parents 497148b + 6d0d774
commit cba68fd
Showing 206 changed files with 2,178 additions and 1,676 deletions.
diff --git a/antlib/extra.xml b/antlib/extra.xml
@@ -25,7 +25,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.rc1.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -136,7 +136,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.rc1.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -152,7 +152,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.rc1.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -168,7 +168,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.rc1.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -460,7 +460,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.rc1.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>

diff --git a/core/pom.rb b/core/pom.rb
@@ -53,7 +53,7 @@
   jar 'org.jruby.joni:joni:2.1.6'
   jar 'org.jruby.extras:bytelist:1.0.13'
   jar 'org.jruby.jcodings:jcodings:1.0.13'
-  jar 'org.jruby:dirgra:0.2'
+  jar 'org.jruby:dirgra:0.3'
 
   jar 'com.headius:invokebinder:1.5'
   jar 'com.headius:options:1.1'

diff --git a/core/pom.xml b/core/pom.xml
@@ -146,7 +146,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>dirgra</artifactId>
-      <version>0.2</version>
+      <version>0.3</version>
     </dependency>
     <dependency>
       <groupId>com.headius</groupId>

diff --git a/core/src/main/java/org/jruby/RubyMatchData.java b/core/src/main/java/org/jruby/RubyMatchData.java
@@ -50,6 +50,7 @@
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
+import org.jruby.util.ByteListHolder;
 import org.jruby.util.StringSupport;
 
 /**
@@ -398,7 +399,7 @@ private int nameToBackrefNumber(RubyString str) {
         return nameToBackrefNumber(getRuntime(), pattern, regs, str);
     }
 
-    private static int nameToBackrefNumber(Ruby runtime, Regex pattern, Region regs, RubyString str) {
+    private static int nameToBackrefNumber(Ruby runtime, Regex pattern, Region regs, ByteListHolder str) {
         if (pattern == null) {
             throw runtime.newIndexError("undefined group name reference: " + str);
         }

diff --git a/core/src/main/java/org/jruby/ir/representations/BasicBlock.java b/core/src/main/java/org/jruby/ir/representations/BasicBlock.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.representations;
 
 import org.jruby.RubyInstanceConfig;
+import org.jruby.dirgra.ExplicitVertexID;
 import org.jruby.ir.IRManager;
 import org.jruby.ir.instructions.Instr;
 import org.jruby.ir.instructions.YieldInstr;
@@ -10,7 +11,6 @@
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.ir.transformations.inlining.InlineCloneInfo;
 import org.jruby.ir.transformations.inlining.SimpleCloneInfo;
-import org.jruby.ir.util.ExplicitVertexID;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/core/src/main/java/org/jruby/ir/util/ExplicitVertexID.java b/core/src/main/java/org/jruby/ir/util/ExplicitVertexID.java
diff --git a/lib/ruby/stdlib/rubygems.rb b/lib/ruby/stdlib/rubygems.rb
@@ -9,7 +9,7 @@
 require 'thread'
 
 module Gem
-  VERSION = '2.4.6'
+  VERSION = '2.4.8'
 end
 
 # Must be first since it unloads the prelude from 1.9.2

diff --git a/lib/ruby/stdlib/rubygems/remote_fetcher.rb b/lib/ruby/stdlib/rubygems/remote_fetcher.rb
@@ -94,7 +94,13 @@ def api_endpoint(uri)
     rescue Resolv::ResolvError
       uri
     else
-      URI.parse "#{uri.scheme}://#{res.target}#{uri.path}"
+      target = res.target.to_s.strip
+
+      if /\.#{Regexp.quote(host)}\z/ =~ target
+        return URI.parse "#{uri.scheme}://#{target}#{uri.path}"
+      end
+
+      uri
     end
   end
 

diff --git a/lib/ruby/truffle/mri/rexml/attlistdecl.rb b/lib/ruby/truffle/mri/rexml/attlistdecl.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/attribute.rb b/lib/ruby/truffle/mri/rexml/attribute.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/cdata.rb b/lib/ruby/truffle/mri/rexml/cdata.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/child.rb b/lib/ruby/truffle/mri/rexml/child.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/comment.rb b/lib/ruby/truffle/mri/rexml/comment.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/doctype.rb b/lib/ruby/truffle/mri/rexml/doctype.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/document.rb b/lib/ruby/truffle/mri/rexml/document.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/dtd/attlistdecl.rb b/lib/ruby/truffle/mri/rexml/dtd/attlistdecl.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/dtd/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/dtd/dtd.rb b/lib/ruby/truffle/mri/rexml/dtd/dtd.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/dtd/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/dtd/elementdecl.rb b/lib/ruby/truffle/mri/rexml/dtd/elementdecl.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/dtd/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/dtd/entitydecl.rb b/lib/ruby/truffle/mri/rexml/dtd/entitydecl.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/dtd/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/dtd/notationdecl.rb b/lib/ruby/truffle/mri/rexml/dtd/notationdecl.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/dtd/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/element.rb b/lib/ruby/truffle/mri/rexml/element.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/encoding.rb b/lib/ruby/truffle/mri/rexml/encoding.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/entity.rb b/lib/ruby/truffle/mri/rexml/entity.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/formatters/default.rb b/lib/ruby/truffle/mri/rexml/formatters/default.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/formatters/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/formatters/pretty.rb b/lib/ruby/truffle/mri/rexml/formatters/pretty.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/formatters/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/formatters/transitive.rb b/lib/ruby/truffle/mri/rexml/formatters/transitive.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/formatters/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/functions.rb b/lib/ruby/truffle/mri/rexml/functions.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/instruction.rb b/lib/ruby/truffle/mri/rexml/instruction.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/light/node.rb b/lib/ruby/truffle/mri/rexml/light/node.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/light/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/namespace.rb b/lib/ruby/truffle/mri/rexml/namespace.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/node.rb b/lib/ruby/truffle/mri/rexml/node.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/output.rb b/lib/ruby/truffle/mri/rexml/output.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parent.rb b/lib/ruby/truffle/mri/rexml/parent.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parseexception.rb b/lib/ruby/truffle/mri/rexml/parseexception.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parsers/baseparser.rb b/lib/ruby/truffle/mri/rexml/parsers/baseparser.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/parsers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parsers/lightparser.rb b/lib/ruby/truffle/mri/rexml/parsers/lightparser.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/parsers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parsers/pullparser.rb b/lib/ruby/truffle/mri/rexml/parsers/pullparser.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/parsers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parsers/sax2parser.rb b/lib/ruby/truffle/mri/rexml/parsers/sax2parser.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/parsers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parsers/streamparser.rb b/lib/ruby/truffle/mri/rexml/parsers/streamparser.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/parsers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parsers/treeparser.rb b/lib/ruby/truffle/mri/rexml/parsers/treeparser.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/parsers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parsers/ultralightparser.rb b/lib/ruby/truffle/mri/rexml/parsers/ultralightparser.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/parsers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/parsers/xpathparser.rb b/lib/ruby/truffle/mri/rexml/parsers/xpathparser.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/parsers/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/quickpath.rb b/lib/ruby/truffle/mri/rexml/quickpath.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/rexml.rb b/lib/ruby/truffle/mri/rexml/rexml.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/sax2listener.rb b/lib/ruby/truffle/mri/rexml/sax2listener.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/security.rb b/lib/ruby/truffle/mri/rexml/security.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/source.rb b/lib/ruby/truffle/mri/rexml/source.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/streamlistener.rb b/lib/ruby/truffle/mri/rexml/streamlistener.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/syncenumerator.rb b/lib/ruby/truffle/mri/rexml/syncenumerator.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/text.rb b/lib/ruby/truffle/mri/rexml/text.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/undefinednamespaceexception.rb b/lib/ruby/truffle/mri/rexml/undefinednamespaceexception.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/validation/relaxng.rb b/lib/ruby/truffle/mri/rexml/validation/relaxng.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/validation/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/validation/validation.rb b/lib/ruby/truffle/mri/rexml/validation/validation.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/validation/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/validation/validationexception.rb b/lib/ruby/truffle/mri/rexml/validation/validationexception.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/rexml/validation/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/xmldecl.rb b/lib/ruby/truffle/mri/rexml/xmldecl.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/xmltokens.rb b/lib/ruby/truffle/mri/rexml/xmltokens.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/xpath.rb b/lib/ruby/truffle/mri/rexml/xpath.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/rexml/xpath_parser.rb b/lib/ruby/truffle/mri/rexml/xpath_parser.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/thread.rb b/lib/ruby/truffle/mri/thread.rb
@@ -26,101 +26,7 @@ class ThreadError < StandardError
   Thread.abort_on_exception = true
 end
 
-#
-# ConditionVariable objects augment class Mutex. Using condition variables,
-# it is possible to suspend while in the middle of a critical section until a
-# resource becomes available.
-#
-# Example:
-#
-#   require 'thread'
-#
-#   mutex = Mutex.new
-#   resource = ConditionVariable.new
-#
-#   a = Thread.new {
-#     mutex.synchronize {
-#       # Thread 'a' now needs the resource
-#       resource.wait(mutex)
-#       # 'a' can now have the resource
-#     }
-#   }
-#
-#   b = Thread.new {
-#     mutex.synchronize {
-#       # Thread 'b' has finished using the resource
-#       resource.signal
-#     }
-#   }
-#
-class ConditionVariable
-  #
-  # Creates a new ConditionVariable
-  #
-  def initialize
-    @waiters = {}
-    @waiters_mutex = Mutex.new
-  end
-
-  #
-  # Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
-  #
-  # If +timeout+ is given, this method returns after +timeout+ seconds passed,
-  # even if no other thread has signaled.
-  #
-  def wait(mutex, timeout=nil)
-    Thread.handle_interrupt(StandardError => :never) do
-      begin
-        Thread.handle_interrupt(StandardError => :on_blocking) do
-          @waiters_mutex.synchronize do
-            @waiters[Thread.current] = true
-          end
-          mutex.sleep timeout
-        end
-      ensure
-        @waiters_mutex.synchronize do
-          @waiters.delete(Thread.current)
-        end
-      end
-    end
-    self
-  end
-
-  #
-  # Wakes up the first thread in line waiting for this lock.
-  #
-  def signal
-    Thread.handle_interrupt(StandardError => :on_blocking) do
-      begin
-        t, _ = @waiters_mutex.synchronize { @waiters.shift }
-        t.run if t
-      rescue ThreadError
-        retry # t was already dead?
-      end
-    end
-    self
-  end
-
-  #
-  # Wakes up all threads waiting for this lock.
-  #
-  def broadcast
-    Thread.handle_interrupt(StandardError => :on_blocking) do
-      threads = nil
-      @waiters_mutex.synchronize do
-        threads = @waiters.keys
-        @waiters.clear
-      end
-      for t in threads
-        begin
-          t.run
-        rescue ThreadError
-        end
-      end
-    end
-    self
-  end
-end
+# Truffle: ConditionVariable is defined in Java.
 
 #
 # This class provides a way to synchronize communication between threads.

diff --git a/lib/ruby/truffle/mri/xmlrpc.rb b/lib/ruby/truffle/mri/xmlrpc.rb
@@ -0,0 +1 @@
+require_relative '../../stdlib/xmlrpc'
diff --git a/lib/ruby/truffle/mri/xmlrpc/base64.rb b/lib/ruby/truffle/mri/xmlrpc/base64.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/xmlrpc/client.rb b/lib/ruby/truffle/mri/xmlrpc/client.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/xmlrpc/config.rb b/lib/ruby/truffle/mri/xmlrpc/config.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/xmlrpc/create.rb b/lib/ruby/truffle/mri/xmlrpc/create.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/xmlrpc/datetime.rb b/lib/ruby/truffle/mri/xmlrpc/datetime.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/xmlrpc/marshal.rb b/lib/ruby/truffle/mri/xmlrpc/marshal.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/xmlrpc/parser.rb b/lib/ruby/truffle/mri/xmlrpc/parser.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/xmlrpc/server.rb b/lib/ruby/truffle/mri/xmlrpc/server.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/xmlrpc/utils.rb b/lib/ruby/truffle/mri/xmlrpc/utils.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)
diff --git a/maven/jruby/pom.xml b/maven/jruby/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9.0.0.0-SNAPSHOT</version>
+    <version>9.0.0.0.rc1</version>
   </parent>
   <artifactId>jruby</artifactId>
   <name>JRuby Main Maven Artifact</name>

diff --git a/spec/ruby/core/symbol/all_symbols_spec.rb b/spec/ruby/core/symbol/all_symbols_spec.rb
@@ -9,7 +9,7 @@
   it "increases size of the return array when new symbol comes" do
     symbols = Symbol.all_symbols
     sym = [eval(":aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")]
-    Symbol.all_symbols.size.should == symbols.size + 1
+    Symbol.all_symbols.size.should > symbols.size
     sym.clear
   end
 end
diff --git a/spec/ruby/library/etc/getlogin_spec.rb b/spec/ruby/library/etc/getlogin_spec.rb
@@ -13,7 +13,7 @@
       if Etc.getlogin
         # Etc.getlogin returns the same result of logname(2)
         # if it returns non NULL
-        Etc.getlogin.should == `logname`.chomp
+        Etc.getlogin.should == `id -un`.chomp
       else
         # Etc.getlogin may return nil if the login name is not set
         # because of chroot or sudo or something.

diff --git a/spec/tags/ruby/core/kernel/spawn_tags.txt b/spec/tags/ruby/core/kernel/spawn_tags.txt
@@ -51,3 +51,5 @@ fails:Kernel#spawn redirects STDOUT to the given file if :out => String
 fails:Kernel#spawn redirects STDERR to the given file if :err => String
 fails:Kernel#spawn when passed :close_others => false does not close file descriptors >= 3 in the child process if fds are set close_on_exec=false
 fails:Kernel.spawn when passed :close_others => false does not close file descriptors >= 3 in the child process if fds are set close_on_exec=false
+fails:Kernel#spawn when passed :close_others => false closes file descriptors >= 3 in the child process because they are set close_on_exec by default
+fails:Kernel.spawn when passed :close_others => false closes file descriptors >= 3 in the child process because they are set close_on_exec by default
diff --git a/spec/tags/ruby/core/process/spawn_tags.txt b/spec/tags/ruby/core/process/spawn_tags.txt
@@ -18,3 +18,4 @@ fails:Process.spawn joins the current process if :pgroup => false
 fails:Process.spawn redirects STDOUT to the given file if :out => String
 fails:Process.spawn redirects STDERR to the given file if :err => String
 fails:Process.spawn when passed :close_others => false does not close file descriptors >= 3 in the child process if fds are set close_on_exec=false
+fails:Process.spawn when passed :close_others => false closes file descriptors >= 3 in the child process because they are set close_on_exec by default
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		require_relative '../../../stdlib/rexml/' + File.basename(__FILE__)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		require_relative '../../../../stdlib/rexml/dtd/' + File.basename(__FILE__)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		require_relative '../../../stdlib/xmlrpc/' + File.basename(__FILE__)