Merge pull request #325 in G/truffleruby from hash-code to master

* commit '35183dec0c13d5681eb21feda6a47259c89c2961':
  Object identity numbers should never be negative

Author: chrisseaton

CHANGELOG.md

@@ -6,6 +6,7 @@ Bug fixes:
 
 * `Kernel#singleton_methods` now correctly ignores prepended modules of
   non-singleton classes. Fixes loading `sass` when `activesupport` is loaded.
+* Object identity numbers should never be negative.
 
 # 1.0 RC 6
 

mx.truffleruby/suite.py

@@ -8,7 +8,7 @@
               # We want tools to be reliably available with TruffleRuby, even with "mx build", so this is a static import.
                 "name": "tools",
                 "subdir": True,
-                "version": "342f380ccde5c53cbd84ba6816c4d3a927bb1160",
+                "version": "9e2a5c512871727b89573da286169290c4373c69",
                 "urls": [
                     {"url": "https://github.com/graalvm/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

spec/truffle/interop/foreign_object_spec.rb

@@ -18,13 +18,13 @@
   it "can be printed with #puts" do
     lambda {
       puts Truffle::Debug.foreign_object
-    }.should output(/#<Foreign:0x\-?\h+>\n/)
+    }.should output(/#<Foreign:0x\h+>\n/)
   end
 
   it "can be printed with #p" do
     lambda {
       p Truffle::Debug.foreign_object
-    }.should output(/#<Foreign:0x\-?\h+>\n/)
+    }.should output(/#<Foreign:0x\h+>\n/)
   end
 
 end

spec/truffle/interop/send_spec.rb

@@ -11,7 +11,7 @@
 describe "Interop #__send__" do
 
   it "can call special forms like outgoing #inspect" do
-    Truffle::Debug.foreign_object.__send__(:inspect).should =~ /#<Foreign:0x\-?\h+>/
+    Truffle::Debug.foreign_object.__send__(:inspect).should =~ /#<Foreign:0x\h+>/
   end
 
 end

spec/truffle/interop/special_forms_spec.rb

@@ -74,7 +74,7 @@
   end
 
   it "#inspect returns a useful string" do
-    Truffle::Debug.foreign_object.inspect.should =~ /#<Foreign:0x\-?\h+>/
+    Truffle::Debug.foreign_object.inspect.should =~ /#<Foreign:0x\h+>/
   end
 
   describe "#is_a?" do
@@ -178,7 +178,7 @@
   end
 
   it "#__send__ can call special forms like outgoing #inspect" do
-    Truffle::Debug.foreign_object.__send__(:inspect).should =~ /#<Foreign:0x\-?\h+>/
+    Truffle::Debug.foreign_object.__send__(:inspect).should =~ /#<Foreign:0x\h+>/
   end
 
 end

src/main/java/org/truffleruby/interop/InteropNodes.java

@@ -1014,7 +1014,9 @@ public abstract static class InteropIdentityHashCodeNode extends CoreMethodArray
         @Specialization
         @TruffleBoundary
         public int identityHashCode(Object value) {
-            return System.identityHashCode(value);
+            final int code = System.identityHashCode(value);
+            assert code >= 0;
+            return code;
         }
 
     }