--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java	2018-09-06 16:46:27.239274100 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java	2018-09-06 16:46:26.685935600 -0700
@@ -844,12 +844,19 @@
     }
 
     @Override
-    public Byte64Vector rearrange(Shuffle<Byte, Shapes.S64Bit> s) {
-        return uOp((i, a) -> {
+    @ForceInline
+    public Byte64Vector rearrange(Shuffle<Byte, Shapes.S64Bit> o1) {
+    Objects.requireNonNull(o1);
+    Byte64Shuffle s =  (Byte64Shuffle)o1;
+
+        return VectorIntrinsics.rearrangeOp(
+            Byte64Vector.class, Byte64Shuffle.class, byte.class, LENGTH,
+            this, s,
+            (v1, s_) -> v1.uOp((i, a) -> {
             byte[] vec = this.getElements();
-            int ei = s.getElement(i);
+            int ei = s_.getElement(i);
             return vec[ei];
-        });
+        }));
     }
 
     @Override