--- old/src/hotspot/share/opto/mulnode.cpp	2019-07-03 10:04:42.007266344 +0200
+++ new/src/hotspot/share/opto/mulnode.cpp	2019-07-03 10:04:41.707266348 +0200
@@ -598,7 +598,7 @@
     }
 
     if (con == markOopDesc::always_locked_pattern) {
-      assert(EnableValhalla || ACmpOnValues == 3, "should only be used for value types");
+      assert(EnableValhalla, "should only be used for value types");
       if (in(1)->is_Load() && phase->type(in(1)->in(MemNode::Address))->is_valuetypeptr()) {
         return in(2); // Obj is known to be a value type
       }