jruby · Jul 21, 2015 · Jul 21, 2015 · Jul 21, 2015 · Jul 21, 2015 · Jul 21, 2015
diff --git a/spec/ruby/core/hash/merge_spec.rb b/spec/ruby/core/hash/merge_spec.rb
@@ -7,6 +7,10 @@
   it "returns a new hash by combining self with the contents of other" do
     h = new_hash(1 => :a, 2 => :b, 3 => :c).merge(:a => 1, :c => 2)
     h.should == new_hash(:c => 2, 1 => :a, 2 => :b, :a => 1, 3 => :c)
+
+    hash = new_hash(:a => 1, :b => 2)
+    new_hash().merge(hash).should == hash
+    hash.merge(new_hash()).should == hash
   end
 
   it "sets any duplicate key to the value of block if passed a block" do

diff --git a/spec/ruby/core/kernel/respond_to_missing_spec.rb b/spec/ruby/core/kernel/respond_to_missing_spec.rb
@@ -10,6 +10,10 @@
     Kernel.should have_private_instance_method(:respond_to_missing?, false)
   end
 
+  it "is only an instance method" do
+    Kernel.method(:respond_to_missing?).owner.should == Kernel
+  end
+
   it "is not called when #respond_to? would return true" do
     obj = mock('object')
     obj.stub!(:glark)

diff --git a/spec/ruby/core/kernel/respond_to_spec.rb b/spec/ruby/core/kernel/respond_to_spec.rb
@@ -1,19 +1,19 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/classes', __FILE__)
 
-describe "Kernel.respond_to?" do
-  it "indicates if a singleton object responds to a particular message" do
-    class KernelSpecs::Foo; def self.bar; 'done'; end; end
-    KernelSpecs::Foo.respond_to?(:bar).should == true
-    KernelSpecs::Foo.respond_to?(:baz).should == false
-  end
-end
-
 describe "Kernel#respond_to?" do
   before :each do
     @a = KernelSpecs::A.new
   end
 
+  it "is a public method" do
+    Kernel.should have_public_instance_method(:respond_to?, false)
+  end
+
+  it "is only an instance method" do
+    Kernel.method(:respond_to?).owner.should == Kernel
+  end
+
   it "returns false if the given method was undefined" do
     @a.respond_to?(:undefed_method).should == false
     @a.respond_to?("undefed_method").should == false

diff --git a/tool/jruby_eclipse b/tool/jruby_eclipse
@@ -27,6 +27,8 @@ args << "-Djruby.shell=/bin/sh"
 
 java_flags = []
 rest = []
+
+ARGV.concat ENV["JRUBY_OPTS"].to_s.split(' ')
 ARGV.each { |arg|
   if arg.start_with?("-Xmx") or arg == "-ea"
     java_flags << arg

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -423,6 +423,7 @@ def findbugs(report=nil)
   end
 
   def check_ambiguous_arguments
+    ENV.delete "JRUBY_ECLIPSE" # never run from the Eclipse launcher here
     pom = "#{JRUBY_DIR}/truffle/pom.rb"
     contents = File.read(pom)
     contents.gsub!(/^(\s+)'source'\s*=>.+'1.7'.+,\n\s+'target'\s*=>.+\s*'1.7.+,\n/) do

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java
@@ -111,7 +111,7 @@ private void addCoreMethod(MethodDetails methodDetails) {
             }
         }
         if (method.onSingleton() && method.constructor()) {
-            System.err.println("WARNING: Either onSingleton or isModuleFunction for " + methodDetails.getIndicativeName());
+            System.err.println("WARNING: Either onSingleton or constructor for " + methodDetails.getIndicativeName());
         }
 
         final RubyRootNode rootNode = makeGenericMethod(context, methodDetails);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/hash/HashNodes.java
@@ -1011,7 +1011,7 @@ public RubyBasicObject mergeEmptyEmpty(RubyBasicObject hash, RubyBasicObject oth
         public RubyBasicObject mergeEmptyPacked(RubyBasicObject hash, RubyBasicObject other, NotProvided block) {
             final Object[] store = (Object[]) getStore(other);
             final Object[] copy = PackedArrayStrategy.copyStore(store);
-            return createHash(hash.getLogicalClass(), getDefaultBlock(hash), getDefaultValue(hash), copy, getSize(hash), null, null);
+            return createHash(hash.getLogicalClass(), getDefaultBlock(hash), getDefaultValue(hash), copy, getSize(other), null, null);
         }
 
         @Specialization(guards = {