--- /dev/null	2014-02-28 14:47:24.359880811 +0400
+++ new/test/compiler/whitebox/GetNMethodTest.java	2014-03-24 21:53:35.276784003 +0400
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2014, 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 GetNMethodTest
+ * @bug 8038240
+ * @library /testlibrary /testlibrary/whitebox
+ * @build GetNMethodTest
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* GetNMethodTest
+ * @summary testing of WB::getNMethod()
+ * @author igor.ignatyev@oracle.com
+ */
+public class GetNMethodTest extends CompilerWhiteBoxTest {
+    public static void main(String[] args) throws Exception {
+        CompilerWhiteBoxTest.main(GetNMethodTest::new, args);
+    }
+
+    private GetNMethodTest(TestCase testCase) {
+        super(testCase);
+        // to prevent inlining of #method
+        WHITE_BOX.testSetDontInlineMethod(method, true);
+    }
+
+    @Override
+    protected void test() throws Exception {
+        checkNotCompiled();
+
+        compile();
+        checkCompiled();
+        byte[] nmethod = WHITE_BOX.getNMethod(method, testCase.isOsr());
+        if (IS_VERBOSE) {
+            System.out.println("nmethod.length = " + nmethod == null ? 0 : nmethod.length);
+        }
+        if (nmethod == null || nmethod.length == 0) {
+            throw new RuntimeException("nmethod of compiled method is empty");
+        }
+        deoptimize();
+        checkNotCompiled();
+        nmethod = WHITE_BOX.getNMethod(method, true);
+        if (nmethod != null) {
+            throw new RuntimeException("nmethod of non-compiled method isn't null");
+        }
+    }
+}
--- old/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	2014-03-24 21:53:35.472783996 +0400
+++ new/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	2014-03-24 21:53:35.392783999 +0400
@@ -135,6 +135,7 @@
   public native boolean enqueueMethodForCompilation(Executable method, int compLevel, int entry_bci);
   public native void    clearMethodState(Executable method);
   public native int     getMethodEntryBci(Executable method);
+  public native byte[]  getNMethod(Executable method, boolean isOsr);
 
   // Intered strings
   public native boolean isInStringTable(String str);
--- old/src/share/vm/prims/whitebox.cpp	2014-03-24 21:53:35.484783995 +0400
+++ new/src/share/vm/prims/whitebox.cpp	2014-03-24 21:53:35.400783999 +0400
@@ -510,6 +510,28 @@
   return features_string;
 WB_END
 
+
+WB_ENTRY(jbyteArray, WB_GetNMethod(JNIEnv* env, jobject o, jobject method, jboolean is_osr))
+  jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+  CHECK_JNI_EXCEPTION_(env, NULL);
+  methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
+  nmethod* code = is_osr ? mh->lookup_osr_nmethod_for(InvocationEntryBci, CompLevel_none, false) : mh->code();
+  jbyteArray result = NULL;
+  if (code == NULL) {
+    return result;
+  }
+  address code_data = code->insts_begin();
+  int code_size = code->insts_size();
+
+  ThreadToNativeFromVM ttn(thread);
+  result = env->NewByteArray(code_size);
+  if (result != NULL) {
+    env->SetByteArrayRegion(result, 0, code_size, (jbyte*) code_data);
+  }
+  return result;
+WB_END
+
+
 //Some convenience methods to deal with objects from java
 int WhiteBox::offset_for_field(const char* field_name, oop object,
     Symbol* signature_symbol) {
@@ -622,6 +644,8 @@
   {CC"fullGC",   CC"()V",                             (void*)&WB_FullGC },
   {CC"readReservedMemory", CC"()V",                   (void*)&WB_ReadReservedMemory },
   {CC"getCPUFeatures",     CC"()Ljava/lang/String;",  (void*)&WB_GetCPUFeatures     },
+  {CC"getNMethod",         CC"(Ljava/lang/reflect/Executable;Z)[B",
+                                                      (void*)&WB_GetNMethod         },
 };
 
 #undef CC