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

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2016, 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=20000 VarHandleTestMethodHandleAccessShort
   */
  
  import org.testng.annotations.BeforeClass;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
--- 21,31 ----
   * questions.
   */
  
  /*
   * @test
!  * @run testng/othervm -Xint -Diters=2000 VarHandleTestMethodHandleAccessShort
   */
  
  import org.testng.annotations.BeforeClass;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
*** 55,64 ****
--- 55,66 ----
  
      VarHandle vhStaticFinalField;
  
      VarHandle vhArray;
  
+     VarHandle vhValueTypeField;
+ 
      @BeforeClass
      public void setup() throws Exception {
          vhFinalField = MethodHandles.lookup().findVarHandle(
                  VarHandleTestMethodHandleAccessShort.class, "final_v", short.class);
  
*** 70,79 ****
--- 72,84 ----
  
          vhStaticField = MethodHandles.lookup().findStaticVarHandle(
              VarHandleTestMethodHandleAccessShort.class, "static_v", short.class);
  
          vhArray = MethodHandles.arrayElementVarHandle(short[].class);
+ 
+         vhValueTypeField = MethodHandles.lookup().findVarHandle(
+                     Value.class, "short_v", short.class);
      }
  
  
      @DataProvider
      public Object[][] accessTestCaseProvider() throws Exception {
*** 98,107 ****
--- 103,117 ----
                                                       vhArray, f, VarHandleTestMethodHandleAccessShort::testArrayUnsupported,
                                                       false));
              cases.add(new MethodHandleAccessTestCase("Array index out of bounds",
                                                       vhArray, f, VarHandleTestMethodHandleAccessShort::testArrayIndexOutOfBounds,
                                                       false));
+         cases.add(new MethodHandleAccessTestCase("Value type field",
+                                                  vhValueTypeField, f, hs -> testValueTypeField(Value.VT, hs)));
+         cases.add(new MethodHandleAccessTestCase("Value type field unsupported",
+                                                  vhValueTypeField, f, hs -> testValueTypeFieldUnsupported(Value.VT, hs),
+                                                  false));
          }
  
          // Work around issue with jtreg summary reporting which truncates
          // the String result of Object.toString to 30 characters, hence
          // the first dummy argument
*** 371,380 ****
--- 381,408 ----
      static void testInstanceFieldUnsupported(VarHandleTestMethodHandleAccessShort recv, Handles hs) throws Throwable {
  
  
      }
  
+     static void testValueTypeField(Value recv, Handles hs) throws Throwable {
+         // Plain
+         {
+             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
+             assertEquals(x, (short)0x0123, "get short value");
+         }
+     }
+ 
+     static void testValueTypeFieldUnsupported(Value recv, Handles hs) throws Throwable {
+         // Plain
+         for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
+             checkUOE(am, () -> {
+                 hs.get(am).invokeExact(recv, (short)0x0123);
+             });
+         }
+ 
+ 
+     }
  
      static void testStaticField(Handles hs) throws Throwable {
          // Plain
          {
              hs.get(TestAccessMode.SET).invokeExact((short)0x0123);