cvm/overlay: (2/2) Fix NMethod test infra

Match makeMethodNotCompilable and NMethod whitebox API

Author: duanyangjing

cvm.mk

@@ -415,9 +415,9 @@ define overlay_single
 endef
 
 ifeq ($(CVM_ARCH),x86_64)
-	JT_OPTS_EXCLUDE=-exclude:$(JDK8_SRCROOT)/jdk/test/ProblemList.txt -exclude:$(CVM8_SRCROOT)/conf/jtreg_jdk8_excludes.list -exclude:$(CVM8_SRCROOT)/conf/jtreg_hotspot8_excludes_x64.list
+	JT_OPTS_EXCLUDE=-exclude:$(JDK8_SRCROOT)/jdk/test/ProblemList.txt -exclude:$(CVM8_SRCROOT)/conf/jtreg_jdk8_excludes.list
 else ifeq ($(CVM_ARCH),aarch64)
-	JT_OPTS_EXCLUDE=-exclude:$(JDK8_SRCROOT)/jdk/test/ProblemList.txt -exclude:$(CVM8_SRCROOT)/conf/jtreg_jdk8_excludes.list -exclude:$(CVM8_SRCROOT)/conf/jtreg_hotspot8_excludes_aarch64.list
+	JT_OPTS_EXCLUDE=-exclude:$(JDK8_SRCROOT)/jdk/test/ProblemList.txt -exclude:$(CVM8_SRCROOT)/conf/jtreg_jdk8_excludes.list
 else
 	ARCH_ERROR := 1
 endif
@@ -439,6 +439,7 @@ endif
 	$(call overlay_single,jdk8u,hotspot/test/compiler/7196199/Test7196199.java, $(JDK8_SRCROOT))
 	$(call overlay_single,jdk8u,hotspot/test/compiler/8004741/Test8004741.java, $(JDK8_SRCROOT))
 	$(call overlay_single,jdk8u,hotspot/test/compiler/stable/StableConfiguration.java, $(JDK8_SRCROOT))
+	$(call overlay_single,jdk8u,hotspot/test/testlibrary/whitebox/sun/hotspot/code/NMethod.java, $(JDK8_SRCROOT))
 
 -overlay-jtreg:
 	$(call overlay_single,jdk8u,test/jtreg-ext/requires/VMProps.java, $(JDK8_SRCROOT))

src/hotspot/share/prims/whitebox.cpp

@@ -2471,7 +2471,7 @@ static JNINativeMethod methods[] = {
   {CC"isIntrinsicAvailable0",
       CC"(Ljava/lang/reflect/Executable;Ljava/lang/reflect/Executable;I)Z",
                                                       (void*)&WB_IsIntrinsicAvailable},
-  {CC"makeMethodNotCompilable0",
+  {CC"makeMethodNotCompilable",
       CC"(Ljava/lang/reflect/Executable;IZ)V",        (void*)&WB_MakeMethodNotCompilable},
 #if HOTSPOT_TARGET_CLASSLIB == 8
   {CC"testSetDontInlineMethod",