src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java

@@ -1,5 +1,28 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 package jdk.internal.vm.vector;
 
 import jdk.internal.HotSpotIntrinsicCandidate;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.vm.annotation.ForceInline;

@@ -18,11 +41,10 @@
 
     // Unary
     public static final int VECTOR_OP_ABS  = 0;
     public static final int VECTOR_OP_NEG  = 1;
     public static final int VECTOR_OP_SQRT = 2;
-    public static final int VECTOR_OP_NOT  = 3;
 
     // Binary
     public static final int VECTOR_OP_ADD  = 4;
     public static final int VECTOR_OP_SUB  = 5;
     public static final int VECTOR_OP_MUL  = 6;

@@ -111,21 +133,21 @@
         assert isNonCapturingLambda(defaultImpl) : defaultImpl;
         return defaultImpl.broadcast(bits, s);
     }
 
     /* ============================================================================ */
-    public interface ShuffleIotaOperation<E> {
-        VectorShuffle<E> apply(int length, int start, int step);
+    public interface ShuffleIotaOperation<E, S extends VectorSpecies<E>> {
+        VectorShuffle<E> apply(int length, int start, int step, S s);
     }
 
     @HotSpotIntrinsicCandidate
     public static
-    <E>
-    VectorShuffle<E> shuffleIota(Class<?> E, Class<?> ShuffleClass, VectorSpecies<E> s, int length,
-                     int start, int step, int wrap, ShuffleIotaOperation<E> defaultImpl) {
+    <E, S extends VectorSpecies<E>>
+    VectorShuffle<E> shuffleIota(Class<?> E, Class<?> ShuffleClass, S s, int length,
+                     int start, int step, int wrap, ShuffleIotaOperation<E, S> defaultImpl) {
        assert isNonCapturingLambda(defaultImpl) : defaultImpl;
-       return defaultImpl.apply(length, start, step);
+       return defaultImpl.apply(length, start, step, s);
     }
 
     public interface ShuffleToVectorOperation<VM, Sh, E> {
        VM apply(Sh s);
     }