--- old/src/hotspot/share/opto/subnode.cpp	2018-09-03 10:46:33.610452676 +0200
+++ new/src/hotspot/share/opto/subnode.cpp	2018-09-03 10:46:33.198452682 +0200
@@ -983,14 +983,6 @@
     if (cmp != NULL) {
       return cmp;
     }
-    if ( TypePtr::NULL_PTR->higher_equal(phase->type(a)) &&
-        !TypePtr::NULL_PTR->higher_equal(phase->type(b))) {
-      // Operand 'b' is never null, swap operands to avoid null check
-      Node* is_value = phase->C->load_is_value_bit(phase, b);
-      set_req(1, phase->transform(new AddPNode(b, b, is_value)));
-      set_req(2, a);
-      return this;
-    }
   }
 
   // Normalize comparisons between Java mirrors into comparisons of the low-
@@ -1103,7 +1095,7 @@
       // RawPtr comparison
       return NULL;
     }
-    assert(EnableValhalla, "unexpected perturbed oop");
+    assert(EnableValhalla && UsePointerPerturbation, "unexpected perturbed oop");
     return in(1);
   }
   return NULL;