--- /dev/null	2017-01-22 10:16:57.869617664 -0800
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRLockTest.java	2017-02-15 16:59:25.347757469 -0800
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+package org.graalvm.compiler.hotspot.test;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import org.graalvm.compiler.api.directives.GraalDirectives;
+
+/**
+ * Test on-stack-replacement with locks.
+ */
+public class GraalOSRLockTest extends GraalOSRTestBase {
+
+    @Ignore("OSR with locks not supported")
+    @Test
+    public void testOSR() {
+        testOSR("test");
+    }
+
+    static int limit = 10000;
+
+    private static Object lock = new Object();
+
+    public static ReturnValue test() {
+        synchronized (lock) {
+            for (int i = 0; i < limit * limit; i++) {
+                GraalDirectives.blackhole(i);
+                if (GraalDirectives.inCompiledCode()) {
+                    return ReturnValue.SUCCESS;
+                }
+            }
+            return ReturnValue.FAILURE;
+        }
+    }
+
+}