test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template

@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2015, 2024, 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.

@@ -19,13 +19,19 @@
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
+ #warn
+ 
  /*
   * @test
   * @bug 8156486
+ #if[Value]
+  * @enablePreview
+  * @modules java.base/jdk.internal.vm.annotation
+ #end[Value]
   * @run testng/othervm VarHandleTestMethodType$Type$
   * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodType$Type$
   * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodType$Type$
   * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodType$Type$
   */

@@ -136,11 +142,11 @@
          });
          checkWMTE(() -> { // receiver primitive class
              $type$ x = ($type$) vh.get(0);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.get(recv);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.get(recv);
          });

@@ -159,11 +165,11 @@
              vh.set(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              vh.set(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.set(recv, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              vh.set(0, $value1$);
          });

@@ -186,11 +192,11 @@
          });
          checkWMTE(() -> { // receiver primitive class
              $type$ x = ($type$) vh.getVolatile(0);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.getVolatile(recv);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getVolatile(recv);
          });

@@ -209,11 +215,11 @@
              vh.setVolatile(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              vh.setVolatile(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.setVolatile(recv, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              vh.setVolatile(0, $value1$);
          });

@@ -236,11 +242,11 @@
          });
          checkWMTE(() -> { // receiver primitive class
              $type$ x = ($type$) vh.getOpaque(0);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.getOpaque(recv);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getOpaque(recv);
          });

@@ -259,11 +265,11 @@
              vh.setOpaque(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              vh.setOpaque(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.setOpaque(recv, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              vh.setOpaque(0, $value1$);
          });

@@ -286,11 +292,11 @@
          });
          checkWMTE(() -> { // receiver primitive class
              $type$ x = ($type$) vh.getAcquire(0);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.getAcquire(recv);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAcquire(recv);
          });

@@ -309,11 +315,11 @@
              vh.setRelease(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              vh.setRelease(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.setRelease(recv, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              vh.setRelease(0, $value1$);
          });

@@ -333,14 +339,14 @@
              boolean r = vh.compareAndSet(null, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.compareAndSet(Void.class, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.compareAndSet(recv, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.compareAndSet(recv, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.compareAndSet(0, $value1$, $value1$);
          });

@@ -359,14 +365,14 @@
              boolean r = vh.weakCompareAndSetPlain(null, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.weakCompareAndSetPlain(Void.class, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSetPlain(recv, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSetPlain(recv, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.weakCompareAndSetPlain(0, $value1$, $value1$);
          });

@@ -385,14 +391,14 @@
              boolean r = vh.weakCompareAndSet(null, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.weakCompareAndSet(Void.class, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSet(recv, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSet(recv, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.weakCompareAndSet(0, $value1$, $value1$);
          });

@@ -411,14 +417,14 @@
              boolean r = vh.weakCompareAndSetAcquire(null, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.weakCompareAndSetAcquire(Void.class, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSetAcquire(recv, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSetAcquire(recv, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.weakCompareAndSetAcquire(0, $value1$, $value1$);
          });

@@ -437,14 +443,14 @@
              boolean r = vh.weakCompareAndSetRelease(null, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.weakCompareAndSetRelease(Void.class, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSetRelease(recv, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSetRelease(recv, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.weakCompareAndSetRelease(0, $value1$, $value1$);
          });

@@ -463,21 +469,21 @@
              $type$ x = ($type$) vh.compareAndExchange(null, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.compareAndExchange(Void.class, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              $type$ x = ($type$) vh.compareAndExchange(recv, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              $type$ x = ($type$) vh.compareAndExchange(recv, $value1$, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.compareAndExchange(0, $value1$, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.compareAndExchange(recv, $value1$, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.compareAndExchange(recv, $value1$, $value1$);
          });

@@ -496,21 +502,21 @@
              $type$ x = ($type$) vh.compareAndExchangeAcquire(null, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(Void.class, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(recv, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(recv, $value1$, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(0, $value1$, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.compareAndExchangeAcquire(recv, $value1$, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.compareAndExchangeAcquire(recv, $value1$, $value1$);
          });

@@ -529,21 +535,21 @@
              $type$ x = ($type$) vh.compareAndExchangeRelease(null, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.compareAndExchangeRelease(Void.class, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              $type$ x = ($type$) vh.compareAndExchangeRelease(recv, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              $type$ x = ($type$) vh.compareAndExchangeRelease(recv, $value1$, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.compareAndExchangeRelease(0, $value1$, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.compareAndExchangeRelease(recv, $value1$, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.compareAndExchangeRelease(recv, $value1$, $value1$);
          });

@@ -562,18 +568,18 @@
              $type$ x = ($type$) vh.getAndSet(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndSet(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndSet(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndSet(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndSet(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndSet(recv, $value1$);
          });

@@ -591,18 +597,18 @@
              $type$ x = ($type$) vh.getAndSetAcquire(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndSetAcquire(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndSetAcquire(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndSetAcquire(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndSetAcquire(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndSetAcquire(recv, $value1$);
          });

@@ -620,18 +626,18 @@
              $type$ x = ($type$) vh.getAndSetRelease(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndSetRelease(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndSetRelease(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndSetRelease(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndSetRelease(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndSetRelease(recv, $value1$);
          });

@@ -651,18 +657,18 @@
              $type$ x = ($type$) vh.getAndAdd(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndAdd(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndAdd(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndAdd(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndAdd(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndAdd(recv, $value1$);
          });

@@ -680,18 +686,18 @@
              $type$ x = ($type$) vh.getAndAddAcquire(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndAddAcquire(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndAddAcquire(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndAddAcquire(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndAddAcquire(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndAddAcquire(recv, $value1$);
          });

@@ -709,18 +715,18 @@
              $type$ x = ($type$) vh.getAndAddRelease(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndAddRelease(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndAddRelease(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndAddRelease(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndAddRelease(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndAddRelease(recv, $value1$);
          });

@@ -740,18 +746,18 @@
              $type$ x = ($type$) vh.getAndBitwiseOr(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndBitwiseOr(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseOr(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndBitwiseOr(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseOr(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseOr(recv, $value1$);
          });

@@ -770,18 +776,18 @@
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseOrAcquire(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseOrAcquire(recv, $value1$);
          });

@@ -800,18 +806,18 @@
              $type$ x = ($type$) vh.getAndBitwiseOrRelease(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndBitwiseOr(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseOr(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndBitwiseOr(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseOr(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseOr(recv, $value1$);
          });

@@ -830,18 +836,18 @@
              $type$ x = ($type$) vh.getAndBitwiseAnd(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndBitwiseAnd(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseAnd(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndBitwiseAnd(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseAnd(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseAnd(recv, $value1$);
          });

@@ -860,18 +866,18 @@
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseAndAcquire(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseAndAcquire(recv, $value1$);
          });

@@ -890,18 +896,18 @@
              $type$ x = ($type$) vh.getAndBitwiseAndRelease(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndBitwiseAnd(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseAnd(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndBitwiseAnd(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseAnd(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseAnd(recv, $value1$);
          });

@@ -920,18 +926,18 @@
              $type$ x = ($type$) vh.getAndBitwiseXor(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndBitwiseXor(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseXor(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndBitwiseXor(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseXor(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseXor(recv, $value1$);
          });

@@ -950,18 +956,18 @@
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseXorAcquire(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseXorAcquire(recv, $value1$);
          });

@@ -980,18 +986,18 @@
              $type$ x = ($type$) vh.getAndBitwiseXorRelease(null, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              $type$ x = ($type$) vh.getAndBitwiseXor(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseXor(recv, Void.class);
          });
          checkWMTE(() -> { // reciever primitive class
              $type$ x = ($type$) vh.getAndBitwiseXor(0, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseXor(recv, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseXor(recv, $value1$);
          });

@@ -1019,11 +1025,11 @@
              checkWMTE(() -> { // receiver primitive class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class)).
                      invokeExact(0);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void x = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodType$Type$.class)).
                      invokeExact(recv);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, VarHandleTestMethodType$Type$.class)).

@@ -1048,11 +1054,11 @@
              });
              hs.checkWMTEOrCCE(() -> { // receiver reference class
                  hs.get(am, methodType(void.class, Class.class, $type$.class)).
                      invokeExact(Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  hs.get(am, methodType(void.class, VarHandleTestMethodType$Type$.class, Class.class)).
                      invokeExact(recv, Void.class);
              });
              checkWMTE(() -> { // receiver primitive class
                  hs.get(am, methodType(void.class, int.class, $type$.class)).

@@ -1078,15 +1084,15 @@
              });
              hs.checkWMTEOrCCE(() -> { // receiver reference class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, $type$.class, $type$.class)).
                      invokeExact(Void.class, $value1$, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodType$Type$.class, Class.class, $type$.class)).
                      invokeExact(recv, Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, VarHandleTestMethodType$Type$.class, $type$.class, Class.class)).
                      invokeExact(recv, $value1$, Void.class);
              });
              checkWMTE(() -> { // receiver primitive class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class , $type$.class, $type$.class)).

@@ -1110,24 +1116,24 @@
              });
              hs.checkWMTEOrCCE(() -> { // receiver reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, $type$.class, $type$.class)).
                      invokeExact(Void.class, $value1$, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, Class.class, $type$.class)).
                      invokeExact(recv, Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, $type$.class, Class.class)).
                      invokeExact(recv, $value1$, Void.class);
              });
              checkWMTE(() -> { // reciever primitive class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class , $type$.class, $type$.class)).
                      invokeExact(0, $value1$, $value1$);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodType$Type$.class , $type$.class, $type$.class)).
                      invokeExact(recv, $value1$, $value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, VarHandleTestMethodType$Type$.class , $type$.class, $type$.class)).

@@ -1151,20 +1157,20 @@
              });
              hs.checkWMTEOrCCE(() -> { // receiver reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, $type$.class)).
                      invokeExact(Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, Class.class)).
                      invokeExact(recv, Void.class);
              });
              checkWMTE(() -> { // reciever primitive class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, $type$.class)).
                      invokeExact(0, $value1$);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodType$Type$.class, $type$.class)).
                      invokeExact(recv, $value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, VarHandleTestMethodType$Type$.class, $type$.class)).

@@ -1190,20 +1196,20 @@
              });
              hs.checkWMTEOrCCE(() -> { // receiver reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, $type$.class)).
                      invokeExact(Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, Class.class)).
                      invokeExact(recv, Void.class);
              });
              checkWMTE(() -> { // reciever primitive class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, $type$.class)).
                      invokeExact(0, $value1$);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodType$Type$.class, $type$.class)).
                      invokeExact(recv, $value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, VarHandleTestMethodType$Type$.class, $type$.class)).

@@ -1229,20 +1235,20 @@
              });
              hs.checkWMTEOrCCE(() -> { // receiver reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, $type$.class)).
                      invokeExact(Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, VarHandleTestMethodType$Type$.class, Class.class)).
                      invokeExact(recv, Void.class);
              });
              checkWMTE(() -> { // reciever primitive class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, $type$.class)).
                      invokeExact(0, $value1$);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, VarHandleTestMethodType$Type$.class, $type$.class)).
                      invokeExact(recv, $value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, VarHandleTestMethodType$Type$.class, $type$.class)).

@@ -1263,11 +1269,11 @@
  
  
      static void testStaticFieldWrongMethodType(VarHandle vh) throws Throwable {
          // Get
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.get();
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.get();
          });

@@ -1277,11 +1283,11 @@
          });
  
  
          // Set
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.set(Void.class);
          });
          // Incorrect arity
          checkWMTE(() -> { // 0
              vh.set();

@@ -1291,11 +1297,11 @@
          });
  
  
          // GetVolatile
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.getVolatile();
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getVolatile();
          });

@@ -1304,11 +1310,11 @@
          });
  
  
          // SetVolatile
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.setVolatile(Void.class);
          });
          // Incorrect arity
          checkWMTE(() -> { // 0
              vh.setVolatile();

@@ -1318,11 +1324,11 @@
          });
  
  
          // GetOpaque
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.getOpaque();
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getOpaque();
          });

@@ -1331,11 +1337,11 @@
          });
  
  
          // SetOpaque
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.setOpaque(Void.class);
          });
          // Incorrect arity
          checkWMTE(() -> { // 0
              vh.setOpaque();

@@ -1345,11 +1351,11 @@
          });
  
  
          // GetAcquire
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.getAcquire();
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAcquire();
          });

@@ -1358,11 +1364,11 @@
          });
  
  
          // SetRelease
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.setRelease(Void.class);
          });
          // Incorrect arity
          checkWMTE(() -> { // 0
              vh.setRelease();

@@ -1373,14 +1379,14 @@
  
  
  #if[CAS]
          // CompareAndSet
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.compareAndSet(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.compareAndSet($value1$, Void.class);
          });
          // Incorrect arity
          checkWMTE(() -> { // 0
              boolean r = vh.compareAndSet();

@@ -1390,14 +1396,14 @@
          });
  
  
          // WeakCompareAndSet
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSetPlain(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSetPlain($value1$, Void.class);
          });
          // Incorrect arity
          checkWMTE(() -> { // 0
              boolean r = vh.weakCompareAndSetPlain();

@@ -1407,14 +1413,14 @@
          });
  
  
          // WeakCompareAndSetVolatile
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSet(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSet($value1$, Void.class);
          });
          // Incorrect arity
          checkWMTE(() -> { // 0
              boolean r = vh.weakCompareAndSet();

@@ -1424,14 +1430,14 @@
          });
  
  
          // WeakCompareAndSetAcquire
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSetAcquire(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSetAcquire($value1$, Void.class);
          });
          // Incorrect arity
          checkWMTE(() -> { // 0
              boolean r = vh.weakCompareAndSetAcquire();

@@ -1441,14 +1447,14 @@
          });
  
  
          // WeakCompareAndSetRelease
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSetRelease(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSetRelease($value1$, Void.class);
          });
          // Incorrect arity
          checkWMTE(() -> { // 0
              boolean r = vh.weakCompareAndSetRelease();

@@ -1458,18 +1464,18 @@
          });
  
  
          // CompareAndExchange
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              $type$ x = ($type$) vh.compareAndExchange(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              $type$ x = ($type$) vh.compareAndExchange($value1$, Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.compareAndExchange($value1$, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.compareAndExchange($value1$, $value1$);
          });

@@ -1482,18 +1488,18 @@
          });
  
  
          // CompareAndExchangeAcquire
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              $type$ x = ($type$) vh.compareAndExchangeAcquire($value1$, Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.compareAndExchangeAcquire($value1$, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.compareAndExchangeAcquire($value1$, $value1$);
          });

@@ -1506,18 +1512,18 @@
          });
  
  
          // CompareAndExchangeRelease
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              $type$ x = ($type$) vh.compareAndExchangeRelease(Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              $type$ x = ($type$) vh.compareAndExchangeRelease($value1$, Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.compareAndExchangeRelease($value1$, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.compareAndExchangeRelease($value1$, $value1$);
          });

@@ -1530,15 +1536,15 @@
          });
  
  
          // GetAndSet
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndSet(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndSet($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndSet($value1$);
          });

@@ -1551,15 +1557,15 @@
          });
  
  
          // GetAndSetAcquire
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndSetAcquire(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndSetAcquire($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndSetAcquire($value1$);
          });

@@ -1572,15 +1578,15 @@
          });
  
  
          // GetAndSetRelease
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndSetRelease(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndSetRelease($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndSetRelease($value1$);
          });

@@ -1594,15 +1600,15 @@
  #end[CAS]
  
  #if[AtomicAdd]
          // GetAndAdd
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndAdd(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndAdd($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndAdd($value1$);
          });

@@ -1615,15 +1621,15 @@
          });
  
  
          // GetAndAddAcquire
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndAddAcquire(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndAddAcquire($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndAddAcquire($value1$);
          });

@@ -1636,15 +1642,15 @@
          });
  
  
          // GetAndAddRelease
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndAddRelease(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndAddRelease($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndAddRelease($value1$);
          });

@@ -1658,15 +1664,15 @@
  #end[AtomicAdd]
  
  #if[Bitwise]
          // GetAndBitwiseOr
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseOr(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseOr($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseOr($value1$);
          });

@@ -1679,15 +1685,15 @@
          });
  
  
          // GetAndBitwiseOrAcquire
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseOrAcquire($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseOrAcquire($value1$);
          });

@@ -1700,15 +1706,15 @@
          });
  
  
          // GetAndBitwiseOrReleaseRelease
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseOrRelease(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseOrRelease($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseOrRelease($value1$);
          });

@@ -1721,15 +1727,15 @@
          });
  
  
          // GetAndBitwiseAnd
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseAnd(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseAnd($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseAnd($value1$);
          });

@@ -1742,15 +1748,15 @@
          });
  
  
          // GetAndBitwiseAndAcquire
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseAndAcquire($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseAndAcquire($value1$);
          });

@@ -1763,15 +1769,15 @@
          });
  
  
          // GetAndBitwiseAndReleaseRelease
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseAndRelease(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseAndRelease($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseAndRelease($value1$);
          });

@@ -1784,15 +1790,15 @@
          });
  
  
          // GetAndBitwiseXor
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseXor(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseXor($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseXor($value1$);
          });

@@ -1805,15 +1811,15 @@
          });
  
  
          // GetAndBitwiseXorAcquire
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseXorAcquire($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseXorAcquire($value1$);
          });

@@ -1826,15 +1832,15 @@
          });
  
  
          // GetAndBitwiseXorReleaseRelease
          // Incorrect argument types
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseXorRelease(Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseXorRelease($value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseXorRelease($value1$);
          });

@@ -1851,11 +1857,11 @@
      static void testStaticFieldWrongMethodType(Handles hs) throws Throwable {
          int i = 0;
  
          for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET)) {
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void x = (Void) hs.get(am, methodType(Void.class)).
                      invokeExact();
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class)).

@@ -1867,11 +1873,11 @@
                      invokeExact(Void.class);
              });
          }
  
          for (TestAccessMode am : testAccessModesOfType(TestAccessType.SET)) {
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  hs.get(am, methodType(void.class, Class.class)).
                      invokeExact(Void.class);
              });
              // Incorrect arity
              checkWMTE(() -> { // 0

@@ -1884,15 +1890,15 @@
              });
          }
  #if[CAS]
          for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
              // Incorrect argument types
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, $type$.class)).
                      invokeExact(Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$.class, Class.class)).
                      invokeExact($value1$, Void.class);
              });
              // Incorrect arity
              checkWMTE(() -> { // 0

@@ -1905,20 +1911,20 @@
              });
          }
  
          for (TestAccessMode am : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
              // Incorrect argument types
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, $type$.class)).
                      invokeExact(Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$.class, Class.class)).
                      invokeExact($value1$, Void.class);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, $type$.class, $type$.class)).
                      invokeExact($value1$, $value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$.class, $type$.class)).

@@ -1935,16 +1941,16 @@
              });
          }
  
          for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_SET)) {
              // Incorrect argument types
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class)).
                      invokeExact(Void.class);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, $type$.class)).
                      invokeExact($value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$.class)).

@@ -1963,16 +1969,16 @@
  #end[CAS]
  
  #if[AtomicAdd]
          for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_ADD)) {
              // Incorrect argument types
-             check{#if[String]?CCE:WMTE}(() -> { // value reference class
+             check{#if[Object]?CCE:WMTE}(() -> { // value reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class)).
                      invokeExact(Void.class);
              });
              // Incorrect return type
-             check{#if[String]?CCE:WMTE}(() -> { // reference class
+             check{#if[Object]?CCE:WMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, $type$.class)).
                      invokeExact($value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$.class)).

@@ -1991,16 +1997,16 @@
  #end[AtomicAdd]
  
  #if[Bitwise]
          for (TestAccessMode am : testAccessModesOfType(TestAccessType.GET_AND_BITWISE)) {
              // Incorrect argument types
-             check{#if[String]?CCE:WMTE}(() -> { // value reference class
+             check{#if[Object]?CCE:WMTE}(() -> { // value reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class)).
                      invokeExact(Void.class);
              });
              // Incorrect return type
-             check{#if[String]?CCE:WMTE}(() -> { // reference class
+             check{#if[Object]?CCE:WMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, $type$.class)).
                      invokeExact($value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$.class)).

@@ -2037,11 +2043,11 @@
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.get(array, Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.get(array, 0);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.get(array, 0);
          });

@@ -2060,11 +2066,11 @@
              vh.set(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              vh.set(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.set(array, 0, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              vh.set(0, 0, $value1$);
          });

@@ -2093,11 +2099,11 @@
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getVolatile(array, Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.getVolatile(array, 0);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getVolatile(array, 0);
          });

@@ -2116,11 +2122,11 @@
              vh.setVolatile(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              vh.setVolatile(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.setVolatile(array, 0, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              vh.setVolatile(0, 0, $value1$);
          });

@@ -2149,11 +2155,11 @@
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getOpaque(array, Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.getOpaque(array, 0);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getOpaque(array, 0);
          });

@@ -2172,11 +2178,11 @@
              vh.setOpaque(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              vh.setOpaque(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.setOpaque(array, 0, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              vh.setOpaque(0, 0, $value1$);
          });

@@ -2205,11 +2211,11 @@
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAcquire(array, Void.class);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void x = (Void) vh.getAcquire(array, 0);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAcquire(array, 0);
          });

@@ -2228,11 +2234,11 @@
              vh.setRelease(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              vh.setRelease(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              vh.setRelease(array, 0, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              vh.setRelease(0, 0, $value1$);
          });

@@ -2255,14 +2261,14 @@
              boolean r = vh.compareAndSet(null, 0, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.compareAndSet(Void.class, 0, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.compareAndSet(array, 0, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.compareAndSet(array, 0, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.compareAndSet(0, 0, $value1$, $value1$);
          });

@@ -2284,14 +2290,14 @@
              boolean r = vh.weakCompareAndSetPlain(null, 0, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.weakCompareAndSetPlain(Void.class, 0, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSetPlain(array, 0, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSetPlain(array, 0, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.weakCompareAndSetPlain(0, 0, $value1$, $value1$);
          });

@@ -2313,14 +2319,14 @@
              boolean r = vh.weakCompareAndSet(null, 0, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.weakCompareAndSet(Void.class, 0, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSet(array, 0, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSet(array, 0, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.weakCompareAndSet(0, 0, $value1$, $value1$);
          });

@@ -2342,14 +2348,14 @@
              boolean r = vh.weakCompareAndSetAcquire(null, 0, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.weakCompareAndSetAcquire(Void.class, 0, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSetAcquire(array, 0, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSetAcquire(array, 0, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.weakCompareAndSetAcquire(0, 0, $value1$, $value1$);
          });

@@ -2371,14 +2377,14 @@
              boolean r = vh.weakCompareAndSetRelease(null, 0, $value1$, $value1$);
          });
          checkCCE(() -> { // receiver reference class
              boolean r = vh.weakCompareAndSetRelease(Void.class, 0, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              boolean r = vh.weakCompareAndSetRelease(array, 0, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              boolean r = vh.weakCompareAndSetRelease(array, 0, $value1$, Void.class);
          });
          checkWMTE(() -> { // receiver primitive class
              boolean r = vh.weakCompareAndSetRelease(0, 0, $value1$, $value1$);
          });

@@ -2400,24 +2406,24 @@
              $type$ x = ($type$) vh.compareAndExchange(null, 0, $value1$, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.compareAndExchange(Void.class, 0, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              $type$ x = ($type$) vh.compareAndExchange(array, 0, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              $type$ x = ($type$) vh.compareAndExchange(array, 0, $value1$, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.compareAndExchange(0, 0, $value1$, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.compareAndExchange(array, Void.class, $value1$, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.compareAndExchange(array, 0, $value1$, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.compareAndExchange(array, 0, $value1$, $value1$);
          });

@@ -2436,24 +2442,24 @@
              $type$ x = ($type$) vh.compareAndExchangeAcquire(null, 0, $value1$, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(Void.class, 0, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(array, 0, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(array, 0, $value1$, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(0, 0, $value1$, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.compareAndExchangeAcquire(array, Void.class, $value1$, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.compareAndExchangeAcquire(array, 0, $value1$, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.compareAndExchangeAcquire(array, 0, $value1$, $value1$);
          });

@@ -2472,24 +2478,24 @@
              $type$ x = ($type$) vh.compareAndExchangeRelease(null, 0, $value1$, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.compareAndExchangeRelease(Void.class, 0, $value1$, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // expected reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // expected reference class
              $type$ x = ($type$) vh.compareAndExchangeRelease(array, 0, Void.class, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // actual reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // actual reference class
              $type$ x = ($type$) vh.compareAndExchangeRelease(array, 0, $value1$, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.compareAndExchangeRelease(0, 0, $value1$, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.compareAndExchangeRelease(array, Void.class, $value1$, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.compareAndExchangeRelease(array, 0, $value1$, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.compareAndExchangeRelease(array, 0, $value1$, $value1$);
          });

@@ -2508,21 +2514,21 @@
              $type$ x = ($type$) vh.getAndSet(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndSet(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndSet(array, 0, Void.class);
          });
          checkWMTE(() -> { // reciarrayever primitive class
              $type$ x = ($type$) vh.getAndSet(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndSet(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndSet(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndSet(array, 0, $value1$);
          });

@@ -2541,21 +2547,21 @@
              $type$ x = ($type$) vh.getAndSetAcquire(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndSetAcquire(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndSetAcquire(array, 0, Void.class);
          });
          checkWMTE(() -> { // reciarrayever primitive class
              $type$ x = ($type$) vh.getAndSetAcquire(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndSetAcquire(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndSetAcquire(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndSetAcquire(array, 0, $value1$);
          });

@@ -2574,21 +2580,21 @@
              $type$ x = ($type$) vh.getAndSetRelease(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndSetRelease(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndSetRelease(array, 0, Void.class);
          });
          checkWMTE(() -> { // reciarrayever primitive class
              $type$ x = ($type$) vh.getAndSetRelease(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndSetRelease(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndSetRelease(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndSetRelease(array, 0, $value1$);
          });

@@ -2608,21 +2614,21 @@
              $type$ x = ($type$) vh.getAndAdd(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndAdd(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndAdd(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndAdd(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndAdd(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndAdd(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndAdd(array, 0, $value1$);
          });

@@ -2641,21 +2647,21 @@
              $type$ x = ($type$) vh.getAndAddAcquire(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndAddAcquire(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndAddAcquire(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndAddAcquire(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndAddAcquire(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndAddAcquire(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndAddAcquire(array, 0, $value1$);
          });

@@ -2674,21 +2680,21 @@
              $type$ x = ($type$) vh.getAndAddRelease(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndAddRelease(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndAddRelease(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndAddRelease(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndAddRelease(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndAddRelease(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndAddRelease(array, 0, $value1$);
          });

@@ -2708,21 +2714,21 @@
              $type$ x = ($type$) vh.getAndBitwiseOr(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndBitwiseOr(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseOr(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndBitwiseOr(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndBitwiseOr(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseOr(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseOr(array, 0, $value1$);
          });

@@ -2741,21 +2747,21 @@
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndBitwiseOrAcquire(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseOrAcquire(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseOrAcquire(array, 0, $value1$);
          });

@@ -2774,21 +2780,21 @@
              $type$ x = ($type$) vh.getAndBitwiseOrRelease(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndBitwiseOrRelease(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseOrRelease(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndBitwiseOrRelease(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndBitwiseOrRelease(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseOrRelease(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseOrRelease(array, 0, $value1$);
          });

@@ -2807,21 +2813,21 @@
              $type$ x = ($type$) vh.getAndBitwiseAnd(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndBitwiseAnd(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseAnd(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndBitwiseAnd(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndBitwiseAnd(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseAnd(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseAnd(array, 0, $value1$);
          });

@@ -2840,21 +2846,21 @@
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndBitwiseAndAcquire(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseAndAcquire(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseAndAcquire(array, 0, $value1$);
          });

@@ -2873,21 +2879,21 @@
              $type$ x = ($type$) vh.getAndBitwiseAndRelease(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndBitwiseAndRelease(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseAndRelease(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndBitwiseAndRelease(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndBitwiseAndRelease(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseAndRelease(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseAndRelease(array, 0, $value1$);
          });

@@ -2906,21 +2912,21 @@
              $type$ x = ($type$) vh.getAndBitwiseXor(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndBitwiseXor(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseXor(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndBitwiseXor(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndBitwiseXor(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseXor(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseXor(array, 0, $value1$);
          });

@@ -2939,21 +2945,21 @@
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndBitwiseXorAcquire(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseXorAcquire(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseXorAcquire(array, 0, $value1$);
          });

@@ -2972,21 +2978,21 @@
              $type$ x = ($type$) vh.getAndBitwiseXorRelease(null, 0, $value1$);
          });
          checkCCE(() -> { // array reference class
              $type$ x = ($type$) vh.getAndBitwiseXorRelease(Void.class, 0, $value1$);
          });
-         check{#if[String]?CCE:WMTE}(() -> { // value reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // value reference class
              $type$ x = ($type$) vh.getAndBitwiseXorRelease(array, 0, Void.class);
          });
          checkWMTE(() -> { // array primitive class
              $type$ x = ($type$) vh.getAndBitwiseXorRelease(0, 0, $value1$);
          });
          checkWMTE(() -> { // index reference class
              $type$ x = ($type$) vh.getAndBitwiseXorRelease(array, Void.class, $value1$);
          });
          // Incorrect return type
-         check{#if[String]?CCE:WMTE}(() -> { // reference class
+         check{#if[Object]?CCE:WMTE}(() -> { // reference class
              Void r = (Void) vh.getAndBitwiseXorRelease(array, 0, $value1$);
          });
          checkWMTE(() -> { // primitive class
              $wrong_primitive_type$ x = ($wrong_primitive_type$) vh.getAndBitwiseXorRelease(array, 0, $value1$);
          });

@@ -3021,11 +3027,11 @@
              checkWMTE(() -> { // index reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, Class.class)).
                      invokeExact(array, Void.class);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void x = (Void) hs.get(am, methodType(Void.class, $type$[].class, int.class)).
                      invokeExact(array, 0);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$[].class, int.class)).

@@ -3050,11 +3056,11 @@
              });
              hs.checkWMTEOrCCE(() -> { // array reference class
                  hs.get(am, methodType(void.class, Class.class, int.class, $type$.class)).
                      invokeExact(Void.class, 0, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  hs.get(am, methodType(void.class, $type$[].class, int.class, Class.class)).
                      invokeExact(array, 0, Void.class);
              });
              checkWMTE(() -> { // receiver primitive class
                  hs.get(am, methodType(void.class, int.class, int.class, $type$.class)).

@@ -3083,15 +3089,15 @@
              });
              hs.checkWMTEOrCCE(() -> { // receiver reference class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, Class.class, int.class, $type$.class, $type$.class)).
                      invokeExact(Void.class, 0, $value1$, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$[].class, int.class, Class.class, $type$.class)).
                      invokeExact(array, 0, Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, $type$[].class, int.class, $type$.class, Class.class)).
                      invokeExact(array, 0, $value1$, Void.class);
              });
              checkWMTE(() -> { // receiver primitive class
                  boolean r = (boolean) hs.get(am, methodType(boolean.class, int.class, int.class, $type$.class, $type$.class)).

@@ -3120,15 +3126,15 @@
              });
              hs.checkWMTEOrCCE(() -> { // array reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, int.class, $type$.class, $type$.class)).
                      invokeExact(Void.class, 0, $value1$, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // expected reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, Class.class, $type$.class)).
                      invokeExact(array, 0, Void.class, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // actual reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, $type$.class, Class.class)).
                      invokeExact(array, 0, $value1$, Void.class);
              });
              checkWMTE(() -> { // array primitive class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, int.class, $type$.class, $type$.class)).

@@ -3137,11 +3143,11 @@
              checkWMTE(() -> { // index reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, Class.class, $type$.class, $type$.class)).
                      invokeExact(array, Void.class, $value1$, $value1$);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, $type$[].class, int.class, $type$.class, $type$.class)).
                      invokeExact(array, 0, $value1$, $value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$[].class, int.class, $type$.class, $type$.class)).

@@ -3166,11 +3172,11 @@
              });
              hs.checkWMTEOrCCE(() -> { // array reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, int.class, $type$.class)).
                      invokeExact(Void.class, 0, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, Class.class)).
                      invokeExact(array, 0, Void.class);
              });
              checkWMTE(() -> { // array primitive class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, int.class, $type$.class)).

@@ -3179,11 +3185,11 @@
              checkWMTE(() -> { // index reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, Class.class, $type$.class)).
                      invokeExact(array, Void.class, $value1$);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, $type$[].class, int.class, $type$.class)).
                      invokeExact(array, 0, $value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$[].class, int.class, $type$.class)).

@@ -3210,11 +3216,11 @@
              });
              hs.checkWMTEOrCCE(() -> { // array reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, int.class, $type$.class)).
                      invokeExact(Void.class, 0, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, Class.class)).
                      invokeExact(array, 0, Void.class);
              });
              checkWMTE(() -> { // array primitive class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, int.class, $type$.class)).

@@ -3223,11 +3229,11 @@
              checkWMTE(() -> { // index reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, Class.class, $type$.class)).
                      invokeExact(array, Void.class, $value1$);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, $type$[].class, int.class, $type$.class)).
                      invokeExact(array, 0, $value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$[].class, int.class, $type$.class)).

@@ -3254,11 +3260,11 @@
              });
              hs.checkWMTEOrCCE(() -> { // array reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, Class.class, int.class, $type$.class)).
                      invokeExact(Void.class, 0, $value1$);
              });
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // value reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, int.class, Class.class)).
                      invokeExact(array, 0, Void.class);
              });
              checkWMTE(() -> { // array primitive class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, int.class, int.class, $type$.class)).

@@ -3267,11 +3273,11 @@
              checkWMTE(() -> { // index reference class
                  $type$ x = ($type$) hs.get(am, methodType($type$.class, $type$[].class, Class.class, $type$.class)).
                      invokeExact(array, Void.class, $value1$);
              });
              // Incorrect return type
-             {#if[String]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
+             {#if[Object]?hs.checkWMTEOrCCE:checkWMTE}(() -> { // reference class
                  Void r = (Void) hs.get(am, methodType(Void.class, $type$[].class, int.class, $type$.class)).
                      invokeExact(array, 0, $value1$);
              });
              checkWMTE(() -> { // primitive class
                  $wrong_primitive_type$ x = ($wrong_primitive_type$) hs.get(am, methodType($wrong_primitive_type$.class, $type$[].class, int.class, $type$.class)).