--- old/src/hotspot/share/classfile/verifier.cpp	2019-07-08 15:46:52.230954456 -0400
+++ new/src/hotspot/share/classfile/verifier.cpp	2019-07-08 15:46:51.918688863 -0400
@@ -1807,7 +1807,7 @@
         case Bytecodes::_monitorenter :
         case Bytecodes::_monitorexit : {
           VerificationType ref = current_frame.pop_stack(
-            VerificationType::reference_check(), CHECK_VERIFY(this));
+            VerificationType::nonscalar_check(), CHECK_VERIFY(this));
           no_control_flow = false; break;
         }
         case Bytecodes::_multianewarray :
--- old/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/VerifierValueTypes.java	2019-07-08 15:46:53.155022803 -0400
+++ new/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/VerifierValueTypes.java	2019-07-08 15:46:52.845671058 -0400
@@ -94,9 +94,10 @@
         // Test that VerifyError is thrown if the class for a withfields's cp fieldref
         // entry is java.lang.Object and the reference on the stack is an inline type.
         runTestVerifyError("wthFldObject", "must be identical inline types");
-*/
+
         // Test VerifyError is thrown if a monitorenter's cp entry is an inline type.
         runTestVerifyError("monEnterVT", "Bad type on operand stack");
+*/
 
         // Test VerifyError is thrown if a defaultvalue's cp entry is an inline type.
         runTestVerifyError("defValueObj", "Illegal type at constant pool entry 4");
--- /dev/null	2019-07-07 00:27:35.580000035 -0400
+++ new/test/hotspot/jtreg/runtime/valhalla/valuetypes/verifier/VTMonitor.java	2019-07-08 15:46:53.483307778 -0400
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8227373
+ * @summary Test that verifier allows monitor operations on inline types.
+ * @compile -XDemitQtypes -XDenableValueTypes -XDallowWithFieldOperator VTMonitor.java
+ * @run main/othervm -Xverify:remote VTMonitor
+ */
+
+public inline final class VTMonitor {
+    final int x;
+    final int y;
+
+    private VTMonitor() {
+        x = 0;
+        y = 0;
+    }
+
+    public static VTMonitor createVTMonitor(int x, int y) {
+        VTMonitor p = VTMonitor.default;
+        p = __WithField(p.x, x);
+        p = __WithField(p.y, y);
+        return p;
+    }
+
+    public static void main(String[] args) {
+        Object a = createVTMonitor(3, 4);
+        try {
+            synchronized(a) {
+                throw new RuntimeException("Synchronization on inline type should fail");
+            }
+        } catch (java.lang.IllegalMonitorStateException e) {
+            // Expected
+        }
+    }
+}