test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2018, 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.
*** 21,31 ****
   * questions.
   */
  
  /*
   * @test
!  * @run testng/othervm -Diters=10    -Xint                   VarHandleTestAccessShort
   * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessShort
   * @run testng/othervm -Diters=20000                         VarHandleTestAccessShort
   * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessShort
   */
  
--- 21,34 ----
   * questions.
   */
  
  /*
   * @test
!  * @compile -XDenableValueTypes Value.java
!  * @run testng/othervm -Xverify:none -Diters=10    -Xint                   VarHandleTestAccessShort
!  */
! /* Disabled temporarily for lworld
   * @run testng/othervm -Diters=20000 -XX:TieredStopAtLevel=1 VarHandleTestAccessShort
   * @run testng/othervm -Diters=20000                         VarHandleTestAccessShort
   * @run testng/othervm -Diters=20000 -XX:-TieredCompilation  VarHandleTestAccessShort
   */
  
*** 58,67 ****
--- 61,72 ----
  
      VarHandle vhStaticFinalField;
  
      VarHandle vhArray;
  
+     VarHandle vhValueTypeField;
+ 
      @BeforeClass
      public void setup() throws Exception {
          vhFinalField = MethodHandles.lookup().findVarHandle(
                  VarHandleTestAccessShort.class, "final_v", short.class);
  
*** 73,82 ****
--- 78,90 ----
  
          vhStaticField = MethodHandles.lookup().findStaticVarHandle(
              VarHandleTestAccessShort.class, "static_v", short.class);
  
          vhArray = MethodHandles.arrayElementVarHandle(short[].class);
+ 
+         vhValueTypeField = MethodHandles.lookup().findVarHandle(
+                     Value.class, "short_v", short.class);
      }
  
  
      @DataProvider
      public Object[][] varHandlesProvider() throws Exception {
*** 208,217 ****
--- 216,230 ----
                                                vhArray, VarHandleTestAccessShort::testArrayUnsupported,
                                                false));
          cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                                vhArray, VarHandleTestAccessShort::testArrayIndexOutOfBounds,
                                                false));
+         cases.add(new VarHandleAccessTestCase("Value type field",
+                                               vhValueTypeField, vh -> testValueTypeField(Value.VT, vh)));
+         cases.add(new VarHandleAccessTestCase("Value type field unsupported",
+                                               vhValueTypeField, vh -> testValueTypeFieldUnsupported(Value.VT, vh),
+                                               false));
  
          // Work around issue with jtreg summary reporting which truncates
          // the String result of Object.toString to 30 characters, hence
          // the first dummy argument
          return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
*** 275,284 ****
--- 288,310 ----
  
  
  
      }
  
+     static void testValueTypeField(Value recv, VarHandle vh) {
+         // Plain
+         {
+             short x = (short) vh.get(recv);
+             assertEquals(x, (short)0x0123, "get short value");
+         }
+     }
+ 
+     static void testValueTypeFieldUnsupported(Value recv, VarHandle vh) {
+         checkUOE(() -> {
+             vh.set(recv, (short)0x4567);
+         });
+     }
  
      static void testStaticFinalField(VarHandle vh) {
          // Plain
          {
              short x = (short) vh.get();