[Truffle] Switched to standard Math.max since the non-standard method…

… didn't seem to buy us much.
jruby · Apr 4, 2016 · 127f063 · 127f063
1 parent 07c0c57
commit 127f063
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java
@@ -276,12 +276,7 @@ private boolean isSingleByteOptimizable(Rope left, Rope right, ConditionProfile
         }
 
         private int depth(Rope left, Rope right) {
-            return max(left.depth(), right.depth()) + 1;
-        }
-
-        private int max(int x, int y) {
-            // This approach is adapted from http://graphics.stanford.edu/~seander/bithacks.html?1=1#IntegerMinOrMax
-            return x - ((x - y) & ((x - y) >> (Integer.SIZE - 1)));
+            return Math.max(left.depth(), right.depth()) + 1;
         }
 
         protected static boolean isMutableRope(Rope rope) {