--- old/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestCallingConvention.java	2018-12-03 14:35:55.514723275 +0100
+++ new/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestCallingConvention.java	2018-12-03 14:35:55.190726478 +0100
@@ -416,4 +416,18 @@
        MyValue3 vt = test21();
        test21_vt.verify(vt);
    }
+
+   // Test returning a non-flattened value type as fields
+   __NotFlattened MyValue3 test22_vt = MyValue3.create();
+
+   @Test
+   public MyValue3 test22() {
+       return test22_vt;
+   }
+
+   @DontCompile
+   public void test22_verifier(boolean warmup) {
+       MyValue3 vt = test22();
+       test22_vt.verify(vt);
+   }
 }