Merge pull request #330 from u2illc/eq_operator

Improve performance of the Equals operator in the RubyComparable class for objects of different types
jruby · Oct 5, 2012 · e2c3728 · e2c3728 · nirvdrum · Oct 8, 2012
2 parents f94ab12 + 8711597
commit e2c3728
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/org/jruby/RubyComparable.java b/src/org/jruby/RubyComparable.java
@@ -116,6 +116,11 @@ private static IRubyObject callCmpMethod(ThreadContext context, IRubyObject recv
         try {
             IRubyObject result = invokedynamic(context, recv, OP_CMP, other);
 
+			// This is only to prevent throwing exceptions by cmperr - it has poor performance
+			if (result.isNil()) {
+				return returnValueOnError;
+			}
+
             return RubyBoolean.newBoolean(runtime, cmpint(context, result, recv, other) == 0);
         } catch (RaiseException e) {
             if (e.getException().kind_of_p(context, runtime.getStandardError()).isTrue()) {