test/hotspot/jtreg/runtime/valhalla/valuetypes/VDefaultTest.java

*** 27,39 ****
  
  /*
   * @test VDefaultTest
   * @summary vdefault bytecode test
   * @library /test/lib
!  * @compile -XDenableValueTypes --add-modules jdk.incubator.mvt Point.java
   * @compile -XDenableValueTypes VDefaultTest.java
!  * @run main/othervm -Xint -XX:+EnableValhalla runtime.valhalla.valuetypes.VDefaultTest
   */
  
  
  /*
   * @run main/othervm -Xcomp -XX:+EnableValhalla runtime.valhalla.valuetypes.VDefaultTest
--- 27,39 ----
  
  /*
   * @test VDefaultTest
   * @summary vdefault bytecode test
   * @library /test/lib
!  * @compile -XDenableValueTypes Point.java
   * @compile -XDenableValueTypes VDefaultTest.java
!  * @run main/othervm -Xint -XX:+EnableValhalla -XX:+PrintValueLayout runtime.valhalla.valuetypes.VDefaultTest
   */
  
  
  /*
   * @run main/othervm -Xcomp -XX:+EnableValhalla runtime.valhalla.valuetypes.VDefaultTest
*** 43,53 ****
  
      static __ByValue final class Point {
          final int x;
          final int y;
  
!         __ValueFactory static Point make() {
              Point p = __MakeDefault Point();
              return p;
          }
          
          Point() {
--- 43,53 ----
  
      static __ByValue final class Point {
          final int x;
          final int y;
  
!         static Point make() {
              Point p = __MakeDefault Point();
              return p;
          }
          
          Point() {
*** 62,74 ****
          final short s;
          final int i;
          final long l;
          final float f;
          final double d;
!         final Point p;
          
!         __ValueFactory static Value make() {
              Value p = __MakeDefault Value();
              return p;
          }
  
          Value () {
--- 62,74 ----
          final short s;
          final int i;
          final long l;
          final float f;
          final double d;
!         __Flattenable final Point p;
          
!         static Value make() {
              Value p = __MakeDefault Value();
              return p;
          }
  
          Value () {
*** 97,106 ****
          Asserts.assertEquals(v.l, 0L, "invalid long default value");
          Asserts.assertEquals(v.f, 0.0F, "invalid float default value");
          Asserts.assertEquals(v.d, 0.0D, "invalid double default value");
          // Asserts below are temporarely disabled because flattening is
          // not supported yet
!         //      Asserts.assertEquals(v.p.x, 0, "invalid embedded value type value");
!         //      Asserts.assertEquals(v.p.y, 0, "invalid embedded value type value");
      }
  }
  
--- 97,106 ----
          Asserts.assertEquals(v.l, 0L, "invalid long default value");
          Asserts.assertEquals(v.f, 0.0F, "invalid float default value");
          Asserts.assertEquals(v.d, 0.0D, "invalid double default value");
          // Asserts below are temporarely disabled because flattening is
          // not supported yet
!         Asserts.assertEquals(v.p.x, 0, "invalid embedded value type value");
!         Asserts.assertEquals(v.p.y, 0, "invalid embedded value type value");
      }
  }