--- old/src/hotspot/share/ci/ciType.cpp	2018-09-06 16:45:29.617867300 -0700
+++ new/src/hotspot/share/ci/ciType.cpp	2018-09-06 16:45:29.083975400 -0700
@@ -139,6 +139,9 @@
 static bool is_float64mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Float64Vector_Float64Mask);
 }
+static bool is_float64shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Float64Vector_Float64Shuffle);
+}
 static bool is_float64(BasicType bt, vmSymbols::SID sid) {
   return is_float64vector(bt, sid) || is_float64species(bt, sid) || is_float64mask(bt, sid);
 }
@@ -151,6 +154,9 @@
 static bool is_float128mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Float128Vector_Float128Mask);
 }
+static bool is_float128shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Float128Vector_Float128Shuffle);
+}
 static bool is_float128(BasicType bt, vmSymbols::SID sid) {
   return is_float128vector(bt, sid) || is_float128species(bt, sid) || is_float128mask(bt, sid);
 }
@@ -163,6 +169,9 @@
 static bool is_float256mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Float256Vector_Float256Mask);
 }
+static bool is_float256shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Float256Vector_Float256Shuffle);
+}
 static bool is_float256(BasicType bt, vmSymbols::SID sid) {
   return is_float256vector(bt, sid) || is_float256species(bt, sid) || is_float256mask(bt, sid);
 }
@@ -175,6 +184,9 @@
 static bool is_float512mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Float512Vector_Float512Mask);
 }
+static bool is_float512shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Float512Vector_Float512Shuffle);
+}
 static bool is_float512(BasicType bt, vmSymbols::SID sid) {
   return is_float512vector(bt, sid) || is_float512species(bt, sid) || is_float512mask(bt, sid);
 }
@@ -190,6 +202,9 @@
 static bool is_double64mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Double64Vector_Double64Mask);
 }
+static bool is_double64shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Double64Vector_Double64Shuffle);
+}
 static bool is_double64(BasicType bt, vmSymbols::SID sid) {
   return is_double64vector(bt, sid) || is_double64species(bt, sid) || is_double64mask(bt, sid);
 }
@@ -202,6 +217,9 @@
 static bool is_double128mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Double128Vector_Double128Mask);
 }
+static bool is_double128shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Double128Vector_Double128Shuffle);
+}
 static bool is_double128(BasicType bt, vmSymbols::SID sid) {
   return is_double128vector(bt, sid) || is_double128species(bt, sid) || is_double128mask(bt, sid);
 }
@@ -214,6 +232,9 @@
 static bool is_double256mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Double256Vector_Double256Mask);
 }
+static bool is_double256shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Double256Vector_Double256Shuffle);
+}
 static bool is_double256(BasicType bt, vmSymbols::SID sid) {
   return is_double256vector(bt, sid) || is_double256species(bt, sid) || is_double256mask(bt, sid);
 }
@@ -226,6 +247,9 @@
 static bool is_double512mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Double512Vector_Double512Mask);
 }
+static bool is_double512shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Double512Vector_Double512Shuffle);
+}
 static bool is_double512(BasicType bt, vmSymbols::SID sid) {
   return is_double512vector(bt, sid) || is_double512species(bt, sid) || is_double512mask(bt, sid);
 }
@@ -241,6 +265,9 @@
 static bool is_int64mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Int64Vector_Int64Mask);
 }
+static bool is_int64shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Int64Vector_Int64Shuffle);
+}
 static bool is_int64(BasicType bt, vmSymbols::SID sid) {
   return is_int64vector(bt, sid) || is_int64species(bt, sid) || is_int64mask(bt, sid);
 }
@@ -253,6 +280,9 @@
 static bool is_int128mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Int128Vector_Int128Mask);
 }
+static bool is_int128shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Int128Vector_Int128Shuffle);
+}
 static bool is_int128(BasicType bt, vmSymbols::SID sid) {
   return is_int128vector(bt, sid) || is_int128species(bt, sid) || is_int128mask(bt, sid);
 }
@@ -265,6 +295,9 @@
 static bool is_int256mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Int256Vector_Int256Mask);
 }
+static bool is_int256shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Int256Vector_Int256Shuffle);
+}
 static bool is_int256(BasicType bt, vmSymbols::SID sid) {
   return is_int256vector(bt, sid) || is_int256species(bt, sid) || is_int256mask(bt, sid);
 }
@@ -277,6 +310,9 @@
 static bool is_int512mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Int512Vector_Int512Mask);
 }
+static bool is_int512shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Int512Vector_Int512Shuffle);
+}
 static bool is_int512(BasicType bt, vmSymbols::SID sid) {
   return is_int512vector(bt, sid) || is_int512species(bt, sid) || is_int512mask(bt, sid);
 }
@@ -292,6 +328,9 @@
 static bool is_long64mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Long64Vector_Long64Mask);
 }
+static bool is_long64shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Long64Vector_Long64Shuffle);
+}
 static bool is_long64(BasicType bt, vmSymbols::SID sid) {
   return is_long64vector(bt, sid) || is_long64species(bt, sid) || is_long64mask(bt, sid);
 }
@@ -304,6 +343,9 @@
 static bool is_long128mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Long128Vector_Long128Mask);
 }
+static bool is_long128shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Long128Vector_Long128Shuffle);
+}
 static bool is_long128(BasicType bt, vmSymbols::SID sid) {
   return is_long128vector(bt, sid) || is_long128species(bt, sid) || is_long128mask(bt, sid);
 }
@@ -316,6 +358,9 @@
 static bool is_long256mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Long256Vector_Long256Mask);
 }
+static bool is_long256shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Long256Vector_Long256Shuffle);
+}
 static bool is_long256(BasicType bt, vmSymbols::SID sid) {
   return is_long256vector(bt, sid) || is_long256species(bt, sid) || is_long256mask(bt, sid);
 }
@@ -328,6 +373,9 @@
 static bool is_long512mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Long512Vector_Long512Mask);
 }
+static bool is_long512shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Long512Vector_Long512Shuffle);
+}
 static bool is_long512(BasicType bt, vmSymbols::SID sid) {
   return is_long512vector(bt, sid) || is_long512species(bt, sid) || is_long512mask(bt, sid);
 }
@@ -343,6 +391,9 @@
 static bool is_byte64mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Byte64Vector_Byte64Mask);
 }
+static bool is_byte64shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Byte64Vector_Byte64Shuffle);
+}
 static bool is_byte64(BasicType bt, vmSymbols::SID sid) {
   return is_byte64vector(bt, sid) || is_byte64species(bt, sid) || is_byte64mask(bt, sid);
 }
@@ -355,6 +406,9 @@
 static bool is_byte128mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Byte128Vector_Byte128Mask);
 }
+static bool is_byte128shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Byte128Vector_Byte128Shuffle);
+}
 static bool is_byte128(BasicType bt, vmSymbols::SID sid) {
   return is_byte128vector(bt, sid) || is_byte128species(bt, sid) || is_byte128mask(bt, sid);
 }
@@ -367,6 +421,9 @@
 static bool is_byte256mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Byte256Vector_Byte256Mask);
 }
+static bool is_byte256shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Byte256Vector_Byte256Shuffle);
+}
 static bool is_byte256(BasicType bt, vmSymbols::SID sid) {
   return is_byte256vector(bt, sid) || is_byte256species(bt, sid) || is_byte256mask(bt, sid);
 }
@@ -379,6 +436,9 @@
 static bool is_byte512mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Byte512Vector_Byte512Mask);
 }
+static bool is_byte512shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Byte512Vector_Byte512Shuffle);
+}
 static bool is_byte512(BasicType bt, vmSymbols::SID sid) {
   return is_byte512vector(bt, sid) || is_byte512species(bt, sid) || is_byte512mask(bt, sid);
 }
@@ -394,6 +454,9 @@
 static bool is_short64mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Short64Vector_Short64Mask);
 }
+static bool is_short64shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Short64Vector_Short64Shuffle);
+}
 static bool is_short64(BasicType bt, vmSymbols::SID sid) {
   return is_short64vector(bt, sid) || is_short64species(bt, sid) || is_short64mask(bt, sid);
 }
@@ -406,6 +469,9 @@
 static bool is_short128mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Short128Vector_Short128Mask);
 }
+static bool is_short128shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Short128Vector_Short128Shuffle);
+}
 static bool is_short128(BasicType bt, vmSymbols::SID sid) {
   return is_short128vector(bt, sid) || is_short128species(bt, sid) || is_short128mask(bt, sid);
 }
@@ -418,6 +484,9 @@
 static bool is_short256mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Short256Vector_Short256Mask);
 }
+static bool is_short256shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Short256Vector_Short256Shuffle);
+}
 static bool is_short256(BasicType bt, vmSymbols::SID sid) {
   return is_short256vector(bt, sid) || is_short256species(bt, sid) || is_short256mask(bt, sid);
 }
@@ -430,6 +499,9 @@
 static bool is_short512mask(BasicType bt, vmSymbols::SID sid) {
   return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Short512Vector_Short512Mask);
 }
+static bool is_short512shuffle(BasicType bt, vmSymbols::SID sid) {
+  return bt == T_OBJECT && sid == vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_incubator_vector_Short512Vector_Short512Shuffle);
+}
 static bool is_short512(BasicType bt, vmSymbols::SID sid) {
   return is_short512vector(bt, sid) || is_short512species(bt, sid) || is_short512mask(bt, sid);
 }
@@ -449,6 +521,16 @@
        is_short64mask(__) || is_short128mask(__) || is_short256mask(__) || is_short512mask(__));
 }
 
+bool ciType::is_vectorshuffle() {
+  return basic_type() == T_OBJECT &&
+      (is_float64shuffle(__) || is_float128shuffle(__) || is_float256shuffle(__) || is_float512shuffle(__) ||
+       is_double64shuffle(__) || is_double128shuffle(__) || is_double256shuffle(__) || is_double512shuffle(__) ||
+       is_int64shuffle(__) || is_int128shuffle(__) || is_int256shuffle(__) || is_int512shuffle(__) ||
+       is_long64shuffle(__) || is_long128shuffle(__) || is_long256shuffle(__) || is_long512shuffle(__) ||
+       is_byte64shuffle(__) || is_byte128shuffle(__) || is_byte256shuffle(__) || is_byte512shuffle(__) ||
+       is_short64shuffle(__) || is_short128shuffle(__) || is_short256shuffle(__) || is_short512shuffle(__));
+}
+
 bool ciType::is_vectorapi_vector() {
   return is_float_vec_or_mask(__) ||
       is_double_vec_or_mask(__) ||