Removing shuffling for annotations

nondex-core/src/main/java/java/lang/Class.java

@@ -3338,7 +3338,7 @@ public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationClass)
      * @since 1.5
      */
     public Annotation[] getAnnotations() {
-        return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(AnnotationParser.toArray(annotationData().annotations));
+        return AnnotationParser.toArray(annotationData().annotations);
     }
 
     /**
@@ -3369,7 +3369,7 @@ public <A extends Annotation> A[] getDeclaredAnnotationsByType(Class<A> annotati
      * @since 1.5
      */
     public Annotation[] getDeclaredAnnotations()  {
-        return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(AnnotationParser.toArray(annotationData().declaredAnnotations));
+        return AnnotationParser.toArray(annotationData().declaredAnnotations);
     }
 
     // annotation data that might get invalidated when JVM TI RedefineClasses() is called

nondex-core/src/main/java/java/lang/reflect/Field.java

@@ -1123,14 +1123,14 @@ public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
     public <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
         Objects.requireNonNull(annotationClass);
 
-        return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(AnnotationSupport.getDirectlyAndIndirectlyPresent(declaredAnnotations(), annotationClass));
+        return AnnotationSupport.getDirectlyAndIndirectlyPresent(declaredAnnotations(), annotationClass);
     }
 
     /**
      * {@inheritDoc}
      */
     public Annotation[] getDeclaredAnnotations()  {
-        return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(AnnotationParser.toArray(declaredAnnotations()));
+        return AnnotationParser.toArray(declaredAnnotations());
     }
 
     private transient Map<Class<? extends Annotation>, Annotation> declaredAnnotations;

nondex-core/src/main/java/java/lang/reflect/Method.java

@@ -612,7 +612,7 @@ public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
      * @since 1.5
      */
     public Annotation[] getDeclaredAnnotations()  {
-        return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(super.getDeclaredAnnotations());
+        return super.getDeclaredAnnotations();
     }
 
     /**
@@ -621,11 +621,7 @@ public Annotation[] getDeclaredAnnotations()  {
      */
     @Override
     public Annotation[][] getParameterAnnotations() {
-	Annotation[][] anns = sharedGetParameterAnnotations(parameterTypes, parameterAnnotations);
-	for (int i = 0;i<anns.length;i++) {
-	    anns[i] = edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(anns[i]);
-	}
-        return anns;
+        return sharedGetParameterAnnotations(parameterTypes, parameterAnnotations);
     }
 
     /**

nondex-instrumentation/src/main/java/edu/illinois/nondex/instr/ClassVisitorShufflingAdder.java

@@ -50,11 +50,6 @@ public class ClassVisitorShufflingAdder extends ClassVisitor {
         apisReturningShufflableArrays.add("java/lang/Class.getDeclaredFields");
         apisReturningShufflableArrays.add("java/lang/Class.getDeclaredMethods");
         apisReturningShufflableArrays.add("java/lang/Class.getDeclaredConstructors");
-        apisReturningShufflableArrays.add("java/lang/Class.getAnnotations");
-        apisReturningShufflableArrays.add("java/lang/Class.getDeclaredAnnotations");
-
-        apisReturningShufflableArrays.add("java/lang/reflect/Field.getAnnotationsByType");
-        apisReturningShufflableArrays.add("java/lang/reflect/Field.getDeclaredAnnotations");
 
         apisReturningShufflableArrays.add("java/io/File.list");
         apisReturningShufflableArrays.add("java/io/File.listFiles");

nondex-instrumentation/src/main/java/edu/illinois/nondex/instr/HashIteratorShufflerASMDump.java

@@ -1,6 +1,5 @@
 package edu.illinois.nondex.instr;
 
-import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.Label;

nondex-instrumentation/src/main/java/edu/illinois/nondex/instr/MethodShufflingAdder.java

@@ -70,57 +70,6 @@ public void visitInsn(int opcode) {
                 }
             };
         }
-        if ("getDeclaredAnnotations".equals(name)) {
-            return new MethodVisitor(Opcodes.ASM5, super.visitMethod(access, name, desc, signature, exceptions)) {
-                @Override
-                public void visitInsn(int opcode) {
-                    if (opcode == Opcodes.ARETURN) {
-                        super.visitMethodInsn(Opcodes.INVOKESTATIC,
-                                "edu/illinois/nondex/shuffling/ControlNondeterminism",
-                                "shuffle", "([Ljava/lang/Object;)[Ljava/lang/Object;", false);
-                        super.visitTypeInsn(Opcodes.CHECKCAST, "[Ljava/lang/annotation/Annotation;");
-                    }
-                    super.visitInsn(opcode);
-                }
-            };
-        }
-        if ("getParameterAnnotations".equals(name)) {
-            return new MethodVisitor(Opcodes.ASM5, super.visitMethod(access, name, desc, signature, exceptions)) {
-                @Override
-                public void visitInsn(int opcode) {
-                    if (opcode == Opcodes.ARETURN) {
-                        super.visitVarInsn(Opcodes.ASTORE, 1);
-                        super.visitInsn(Opcodes.ICONST_0);
-                        super.visitVarInsn(Opcodes.ISTORE, 2);
-                        Label l0 = new Label();
-                        super.visitLabel(l0);
-                        super.visitFrame(Opcodes.F_APPEND, 2, new Object[]{
-                            "[[Ljava/lang/annotation/Annotation;", Opcodes.INTEGER}, 0, null);
-                        super.visitVarInsn(Opcodes.ILOAD, 2);
-                        super.visitVarInsn(Opcodes.ALOAD, 1);
-                        super.visitInsn(Opcodes.ARRAYLENGTH);
-                        Label l1 = new Label();
-                        super.visitJumpInsn(Opcodes.IF_ICMPGE, l1);
-                        super.visitVarInsn(Opcodes.ALOAD, 1);
-                        super.visitVarInsn(Opcodes.ILOAD, 2);
-                        super.visitVarInsn(Opcodes.ALOAD, 1);
-                        super.visitVarInsn(Opcodes.ILOAD, 2);
-                        super.visitInsn(Opcodes.AALOAD);
-                        super.visitMethodInsn(Opcodes.INVOKESTATIC,
-                                "edu/illinois/nondex/shuffling/ControlNondeterminism",
-                                "shuffle", "([Ljava/lang/Object;)[Ljava/lang/Object;", false);
-                        super.visitTypeInsn(Opcodes.CHECKCAST, "[Ljava/lang/annotation/Annotation;");
-                        super.visitInsn(Opcodes.AASTORE);
-                        super.visitIincInsn(2, 1);
-                        super.visitJumpInsn(Opcodes.GOTO, l0);
-                        super.visitLabel(l1);
-                        super.visitFrame(Opcodes.F_CHOP, 1, null, 0, null);
-                        super.visitVarInsn(Opcodes.ALOAD, 1);
-                    }
-                    super.visitInsn(opcode);
-                }
-            };
-        }
 
         return super.visitMethod(access, name, desc, signature, exceptions);
     }

nondex-test/src/test/java/edu/illinois/nondex/core/ClassTest.java

@@ -41,9 +41,6 @@ public class ClassTest {
 
     @Before
     public void setUp() {
-        // TODO: pick a class with annotations and test:
-        // clazz.getAnnotations();
-        // clazz.getDeclaredAnnotations();
         clazz = ClassTestHelper.class;
     }
 
@@ -81,14 +78,4 @@ public void getMethodsTest() {
     public void getDeclaredMethodsTest() {
         assertThat(clazz.getDeclaredMethods(), not(equalTo(clazz.getDeclaredMethods())));
     }
-
-    @Test
-    public void getAnnotationsTest() {
-        assertThat(clazz.getAnnotations(), not(equalTo(clazz.getAnnotations())));
-    }
-
-    @Test
-    public void getDeclaredAnnotationsTest() {
-        assertThat(clazz.getDeclaredAnnotations(), not(equalTo(clazz.getDeclaredAnnotations())));
-    }
 }

nondex-test/src/test/java/edu/illinois/nondex/core/ClassTestHelper.java

@@ -28,10 +28,6 @@ a copy of this software and associated documentation files (the
 
 package edu.illinois.nondex.core;
 
-@TestAnnotation1
-@TestAnnotation2
-@TestAnnotation3
-@TestAnnotation4
 public class ClassTestHelper {
 
     public class InnerOne {
@@ -50,10 +46,6 @@ public class InnerFour {
 
     }
 
-    @TestAnnotation1
-    @TestAnnotation2
-    @TestAnnotation3
-    @TestAnnotation4
     public Integer field1;
 
     public Integer field2;
@@ -86,11 +78,7 @@ public ClassTestHelper(Integer f1, Integer f2, Integer f3, Integer f4) {
         field4 = f4;
     }
 
-    @TestAnnotation1
-    @TestAnnotation2
-    @TestAnnotation3
-    @TestAnnotation4
-    public int m1(@TestAnnotation1 @TestAnnotation2 @TestAnnotation3 @TestAnnotation4 Integer param)
+    public int m1(Integer param)
         throws NullPointerException, ArithmeticException, ArrayIndexOutOfBoundsException, ClassCastException, Exception {
         return param;
     }

nondex-test/src/test/java/edu/illinois/nondex/core/MethodTest.java

@@ -46,11 +46,6 @@ public void setUp() throws NoSuchMethodException {
         myMethod = clazz.getMethod("m1", Integer.class);
     }
 
-    @Test
-    public void getDeclaredAnnotationsTest() {
-        assertThat(myMethod.getDeclaredAnnotations(), not(equalTo(myMethod.getDeclaredAnnotations())));
-    }
-
     @Test
     public void getExceptionTypesTest() {
         assertThat(myMethod.getExceptionTypes(), not(equalTo(myMethod.getExceptionTypes())));
@@ -60,9 +55,4 @@ public void getExceptionTypesTest() {
     public void getGenericExceptionTypesTest() {
         assertThat(myMethod.getGenericExceptionTypes(), not(equalTo(myMethod.getGenericExceptionTypes())));
     }
-
-    @Test
-    public void getParamaterAnnotationsTest() {
-        assertThat(myMethod.getParameterAnnotations(), not(equalTo(myMethod.getParameterAnnotations())));
-    }
 }