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

@@ -27,11 +27,11 @@
 
 /*
  * @test VWithFieldTest
  * @summary vwithfield bytecode test
  * @library /test/lib
- * @compile -XDenableValueTypes --add-modules jdk.incubator.mvt Point.java
+ * @compile -XDenableValueTypes Point.java
  * @compile -XDenableValueTypes VWithFieldTest.java
  * @run main/othervm -Xint -XX:+EnableValhalla runtime.valhalla.valuetypes.VWithFieldTest
  */
 
 

@@ -44,11 +44,11 @@
 
     static __ByValue final class Point {
         final private int x;
         final private int y;
         
-        __ValueFactory static Point make(int x, int y) {
+        static Point make(int x, int y) {
             Point p = __MakeDefault Point();
             Asserts.assertEquals(p.x, 0, "invalid x default value");
             Asserts.assertEquals(p.y, 0, "invalid y default value");
             p.x = x;
             Asserts.assertEquals(p.x, x, "invalid x value");

@@ -66,20 +66,20 @@
 
         public int getX() {
             return x;
         }
         
-        __ValueFactory static Point setX(Point p, int x) {
+        static Point setX(Point p, int x) {
             p.x = x;
             return p;
         }
 
         public int getY() {
             return y;
         }
         
-        __ValueFactory static Point setY(Point p, int y) {
+        static Point setY(Point p, int y) {
             p.y = y;
             return p;
         }
     }