--- old/test/hotspot/jtreg/runtime/valhalla/valuetypes/VWithFieldTest.java	2018-03-05 10:57:17.772533564 -0500
+++ new/test/hotspot/jtreg/runtime/valhalla/valuetypes/VWithFieldTest.java	2018-03-05 10:57:17.436526558 -0500
@@ -29,7 +29,7 @@
  * @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
  */
@@ -46,7 +46,7 @@
 	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");
@@ -68,7 +68,7 @@
 	    return x;
 	}
 	
-	__ValueFactory static Point setX(Point p, int x) {
+	static Point setX(Point p, int x) {
 	    p.x = x;
 	    return p;
 	}
@@ -77,7 +77,7 @@
 	    return y;
 	}
 	
-	__ValueFactory static Point setY(Point p, int y) {
+	static Point setY(Point p, int y) {
 	    p.y = y;
 	    return p;
 	}