--- a/hotspot/src/share/vm/opto/vectornode.cpp	Mon Nov 09 13:27:18 2015 +0000
+++ b/hotspot/src/share/vm/opto/vectornode.cpp	Mon Nov 09 11:26:41 2015 -0800
@@ -188,7 +188,7 @@
       (vlen > 1) && is_power_of_2(vlen) &&
       Matcher::vector_size_supported(bt, vlen)) {
     int vopc = VectorNode::opcode(opc, bt);
-    return vopc > 0 && Matcher::match_rule_supported(vopc) && (vopc != Op_CMoveD || vlen == 4);
+    return vopc > 0 && Matcher::match_rule_supported_vector(vopc, vlen);
   }
   return false;
 }