--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java	2018-09-06 16:47:37.503501700 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java	2018-09-06 16:47:36.973340900 -0700
@@ -915,12 +915,19 @@
     }
 
     @Override
-    public Long512Vector rearrange(Shuffle<Long, Shapes.S512Bit> s) {
-        return uOp((i, a) -> {
+    @ForceInline
+    public Long512Vector rearrange(Shuffle<Long, Shapes.S512Bit> o1) {
+    Objects.requireNonNull(o1);
+    Long512Shuffle s =  (Long512Shuffle)o1;
+
+        return VectorIntrinsics.rearrangeOp(
+            Long512Vector.class, Long512Shuffle.class, long.class, LENGTH,
+            this, s,
+            (v1, s_) -> v1.uOp((i, a) -> {
             long[] vec = this.getElements();
-            int ei = s.getElement(i);
+            int ei = s_.getElement(i);
             return vec[ei];
-        });
+        }));
     }
 
     @Override