--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java	2018-09-06 16:48:01.085965000 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java	2018-09-06 16:48:00.561839900 -0700
@@ -845,12 +845,19 @@
     }
 
     @Override
-    public Short64Vector rearrange(Shuffle<Short, Shapes.S64Bit> s) {
-        return uOp((i, a) -> {
+    @ForceInline
+    public Short64Vector rearrange(Shuffle<Short, Shapes.S64Bit> o1) {
+    Objects.requireNonNull(o1);
+    Short64Shuffle s =  (Short64Shuffle)o1;
+
+        return VectorIntrinsics.rearrangeOp(
+            Short64Vector.class, Short64Shuffle.class, short.class, LENGTH,
+            this, s,
+            (v1, s_) -> v1.uOp((i, a) -> {
             short[] vec = this.getElements();
-            int ei = s.getElement(i);
+            int ei = s_.getElement(i);
             return vec[ei];
-        });
+        }));
     }
 
     @Override