src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java

rev 58165 : Fix the issue that unslice modifies the argument vector
Summary: Change the name of getElements() to vec() and clone argument value to
avoid it being modified

@@ -86,11 +86,11 @@
     // and lazy version of C++ templates.
 
     // Virtualized getter
 
     /*package-private*/
-    abstract byte[] getElements();
+    abstract byte[] vec();
 
     // Virtualized constructors
 
     /**
      * Build a vector directly using my own constructor.

@@ -150,11 +150,11 @@
     abstract
     ByteVector uOp(FUnOp f);
     @ForceInline
     final
     ByteVector uOpTemplate(FUnOp f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         byte[] res = new byte[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec[i]);
         }
         return vectorFactory(res);

@@ -166,11 +166,11 @@
                              FUnOp f);
     @ForceInline
     final
     ByteVector uOpTemplate(VectorMask<Byte> m,
                                      FUnOp f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         byte[] res = new byte[length()];
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec[i]) : vec[i];
         }

@@ -191,12 +191,12 @@
     @ForceInline
     final
     ByteVector bOpTemplate(Vector<Byte> o,
                                      FBinOp f) {
         byte[] res = new byte[length()];
-        byte[] vec1 = this.getElements();
-        byte[] vec2 = ((ByteVector)o).getElements();
+        byte[] vec1 = this.vec();
+        byte[] vec2 = ((ByteVector)o).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i]);
         }
         return vectorFactory(res);
     }

@@ -210,12 +210,12 @@
     final
     ByteVector bOpTemplate(Vector<Byte> o,
                                      VectorMask<Byte> m,
                                      FBinOp f) {
         byte[] res = new byte[length()];
-        byte[] vec1 = this.getElements();
-        byte[] vec2 = ((ByteVector)o).getElements();
+        byte[] vec1 = this.vec();
+        byte[] vec2 = ((ByteVector)o).vec();
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i]) : vec1[i];
         }
         return vectorFactory(res);

@@ -237,13 +237,13 @@
     final
     ByteVector tOpTemplate(Vector<Byte> o1,
                                      Vector<Byte> o2,
                                      FTriOp f) {
         byte[] res = new byte[length()];
-        byte[] vec1 = this.getElements();
-        byte[] vec2 = ((ByteVector)o1).getElements();
-        byte[] vec3 = ((ByteVector)o2).getElements();
+        byte[] vec1 = this.vec();
+        byte[] vec2 = ((ByteVector)o1).vec();
+        byte[] vec3 = ((ByteVector)o2).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i], vec3[i]);
         }
         return vectorFactory(res);
     }

@@ -259,13 +259,13 @@
     ByteVector tOpTemplate(Vector<Byte> o1,
                                      Vector<Byte> o2,
                                      VectorMask<Byte> m,
                                      FTriOp f) {
         byte[] res = new byte[length()];
-        byte[] vec1 = this.getElements();
-        byte[] vec2 = ((ByteVector)o1).getElements();
-        byte[] vec3 = ((ByteVector)o2).getElements();
+        byte[] vec1 = this.vec();
+        byte[] vec2 = ((ByteVector)o1).vec();
+        byte[] vec3 = ((ByteVector)o2).vec();
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i], vec3[i]) : vec1[i];
         }
         return vectorFactory(res);

@@ -277,11 +277,11 @@
     abstract
     byte rOp(byte v, FBinOp f);
     @ForceInline
     final
     byte rOpTemplate(byte v, FBinOp f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             v = f.apply(i, v, vec[i]);
         }
         return v;
     }

@@ -296,11 +296,11 @@
     /*package-private*/
     @ForceInline
     final
     <M> ByteVector ldOp(M memory, int offset,
                                   FLdOp<M> f) {
-        //dummy; no vec = getElements();
+        //dummy; no vec = vec();
         byte[] res = new byte[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(memory, offset, i);
         }
         return vectorFactory(res);

@@ -310,11 +310,11 @@
     @ForceInline
     final
     <M> ByteVector ldOp(M memory, int offset,
                                   VectorMask<Byte> m,
                                   FLdOp<M> f) {
-        //byte[] vec = getElements();
+        //byte[] vec = vec();
         byte[] res = new byte[length()];
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             if (mbits[i]) {
                 res[i] = f.apply(memory, offset, i);

@@ -330,11 +330,11 @@
     /*package-private*/
     @ForceInline
     final
     <M> void stOp(M memory, int offset,
                   FStOp<M> f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             f.apply(memory, offset, i, vec[i]);
         }
     }
 

@@ -342,11 +342,11 @@
     @ForceInline
     final
     <M> void stOp(M memory, int offset,
                   VectorMask<Byte> m,
                   FStOp<M> f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < vec.length; i++) {
             if (mbits[i]) {
                 f.apply(memory, offset, i, vec[i]);
             }

@@ -364,12 +364,12 @@
     @ForceInline
     final
     AbstractMask<Byte> bTest(int cond,
                                   Vector<Byte> o,
                                   FBinTest f) {
-        byte[] vec1 = getElements();
-        byte[] vec2 = ((ByteVector)o).getElements();
+        byte[] vec1 = vec();
+        byte[] vec2 = ((ByteVector)o).vec();
         boolean[] bits = new boolean[length()];
         for (int i = 0; i < length(); i++){
             bits[i] = f.apply(cond, i, vec1[i], vec2[i]);
         }
         return maskFactory(bits);

@@ -2044,12 +2044,12 @@
     final
     @ForceInline
     ByteVector sliceTemplate(int origin, Vector<Byte> v1) {
         ByteVector that = (ByteVector) v1;
         that.check(this);
-        byte[] a0 = this.getElements();
-        byte[] a1 = that.getElements();
+        byte[] a0 = this.vec();
+        byte[] a1 = that.vec();
         byte[] res = new byte[a0.length];
         int vlen = res.length;
         int firstPart = vlen - origin;
         System.arraycopy(a0, origin, res, 0, firstPart);
         System.arraycopy(a1, 0, res, firstPart, origin);

@@ -2087,12 +2087,12 @@
     @ForceInline
     ByteVector
     unsliceTemplate(int origin, Vector<Byte> w, int part) {
         ByteVector that = (ByteVector) w;
         that.check(this);
-        byte[] slice = this.getElements();
-        byte[] res = that.getElements();
+        byte[] slice = this.vec();
+        byte[] res = that.vec().clone();
         int vlen = res.length;
         int firstPart = vlen - origin;
         switch (part) {
         case 0:
             System.arraycopy(slice, 0, res, origin, firstPart);