--- old/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestCallingConvention.java	2019-01-08 17:03:20.250505791 +0100
+++ new/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestCallingConvention.java	2019-01-08 17:03:19.922508400 +0100
@@ -479,4 +479,27 @@
         MyValue2.box vt = test24();
         Asserts.assertEQ(vt, null);
     }
+
+    // Same as test24 but with control flow and inlining
+    @ForceInline
+    public MyValue2.box test26_callee(boolean b) {
+        if (b) {
+            return null;
+        } else {
+            return MyValue2.createWithFieldsInline(rI, true);
+        }
+    }
+
+    @Test
+    public MyValue2.box test26(boolean b) {
+        return test26_callee(b);
+    }
+
+    @DontCompile
+    public void test26_verifier(boolean warmup) {
+        MyValue2.box vt = test26(true);
+        Asserts.assertEQ(vt, null);
+        vt = test26(false);
+        Asserts.assertEQ(vt.hash(), MyValue2.createWithFieldsInline(rI, true).hash());
+    }
 }