*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest11.java	Mon Mar 20 17:37:21 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest11.java	Mon Mar 20 17:37:21 2017

*** 39,49 ****
--- 39,49 ----
      }
  
      @SuppressWarnings("all")
      public static int referenceSnippet(int a) {
          if ((a & 15) != 15) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return 0;
      }
  
      @Test

*** 52,76 ****
--- 52,76 ----
      }
  
      @SuppressWarnings("all")
      public static int test1Snippet(int a) {
          if ((a & 8) != 8) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 15) != 15) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return 0;
      }
  
      @SuppressWarnings("all")
      public static int test2Snippet(int a) {
          if ((a & 8) == 0) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 15) != 15) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return 0;
      }
  
      @Test

*** 79,92 ****
--- 79,92 ----
      }
  
      @SuppressWarnings("all")
      public static int test3Snippet(int a) {
          if ((a & 15) != 15) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 8) != 8) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return 0;
      }
  
      @Test

*** 96,109 ****
--- 96,109 ----
      }
  
      @SuppressWarnings("all")
      public static int test4Snippet(int a) {
          if ((a & 15) != 15) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 8) == 0) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return 0;
      }
  
      @Test

*** 112,122 ****
--- 112,122 ----
          testConditionalElimination("test4Snippet", "referenceSnippet");
      }
  
      public static int test5Snippet(int a) {
          if ((a & 5) == 5) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 7) != 0) {
              return 0;
          }
          return 1;

*** 128,171 ****
--- 128,171 ----
          testConditionalElimination("test5Snippet", "test5Snippet");
      }
  
      public static int test6Snippet(int a) {
          if ((a & 8) != 0) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 15) != 15) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return 0;
      }
  
      public static int reference6Snippet(int a) {
          if ((a & 8) != 0) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
!         GraalDirectives.deoptimizeAndInvalidate();
          return 0;
      }
  
      @Test
      public void test6() {
          testConditionalElimination("test6Snippet", "reference6Snippet");
      }
  
      public static int test7Snippet(int a) {
          if ((a & 15) == 15) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 8) == 8) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return a;
      }
  
      public static int reference7Snippet(int a) {
          if ((a & 8) == 8) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return a;
      }
  
      @Test

*** 173,196 ****
--- 173,196 ----
          testConditionalElimination("test7Snippet", "reference7Snippet");
      }
  
      public static int test8Snippet(int a) {
          if ((a & 16) == 16) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 8) != 8) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 44) != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return a;
      }
  
      public static int reference8Snippet(int a) {
          if ((a & 60) != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return a;
      }
  
      @Ignore("requires merging of bit tests")

*** 199,225 ****
--- 199,225 ----
          testConditionalElimination("test8Snippet", "reference8Snippet");
      }
  
      public static int test9Snippet(int a) {
          if ((a & 16) == 16) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 8) != 8) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 44) != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if (a != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return a;
      }
  
      public static int reference9Snippet(int a) {
          if (a != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return a;
      }
  
      @Test

*** 237,302 ****
--- 237,304 ----
  
      public static int test10Snippet(ByteHolder b) {
          int v = b.byteValue();
          long a = v & 0xffffffff;
          if (v != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 16) == 16) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 8) != 8) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 44) != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
  
          return v;
      }
  
      public static int reference10Snippet(ByteHolder b) {
          byte v = b.byteValue();
          if (v != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return v;
      }
  
      @Test
+     @Ignore
      public void test10() {
          testConditionalElimination("test10Snippet", "reference10Snippet");
      }
  
      public static int test11Snippet(ByteHolder b) {
          int v = b.byteValue();
          long a = v & 0xffffffff;
  
          if ((a & 16) == 16) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 8) != 8) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if ((a & 44) != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          if (v != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return v;
      }
  
      public static int reference11Snippet(ByteHolder b) {
          byte v = b.byteValue();
          if (v != 44) {
!             GraalDirectives.deoptimizeAndInvalidate();
          }
          return v;
      }
  
      @Test
+     @Ignore
      public void test11() {
          testConditionalElimination("test11Snippet", "reference11Snippet");
      }
  
  }