jruby · Jun 23, 2015 · Jun 23, 2015
Showing with 46 additions and 1 deletion.

+1 −1 lib/pom.xml

+1 −0 truffle/src/main/ruby/core.rb

+44 −0 truffle/src/main/ruby/core/rubinius/api/shims/comparable.rb
diff --git a/lib/pom.xml b/lib/pom.xml
@@ -144,7 +144,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jar-dependencies</artifactId>
-      <version>0.1.14</version>
+      <version>0.1.15</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>

diff --git a/truffle/src/main/ruby/core.rb b/truffle/src/main/ruby/core.rb
@@ -140,6 +140,7 @@ def self.omit(reason)
 #require_relative 'core/rubinius/common/global'
 #require_relative 'core/rubinius/common/backtrace'
 require_relative 'core/rubinius/common/comparable'
+require_relative 'core/rubinius/api/shims/comparable'
 require_relative 'core/rubinius/common/numeric_mirror'
 require_relative 'core/rubinius/common/numeric'
 require_relative 'core/rubinius/common/ctype'

diff --git a/truffle/src/main/ruby/core/rubinius/api/shims/comparable.rb b/truffle/src/main/ruby/core/rubinius/api/shims/comparable.rb
@@ -0,0 +1,44 @@
+# Copyright (c) 2007-2015, Evan Phoenix and contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of Rubinius nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+module Comparable
+  # Truffle: Add recursion check instead of rescuing SystemStackError
+  def ==(other)
+    return true if equal?(other)
+
+    return false if Thread.detect_recursion(self, other) do
+      begin
+        unless comp = (self <=> other)
+          return false
+        end
+
+        return Comparable.compare_int(comp) == 0
+      rescue StandardError
+        return false
+      end
+    end
+  end
+end