I forgot to do a few nits from Serguei before pushing the fix for JDK-8210665. This addresses that.

http://cr.openjdk.java.net/%7Ejcbeyler/8210665/webrev.00/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp.udiff.html

+ fields[i].fid = env-> GetStaticFieldID(
+ cls, fields[i].name, fields[i].sig);
. . .
+ fields[i].fid = env->GetFieldID(
+ cls, fields[i].name, fields[i].sig);

  It is better to make the above one-liners.


http://cr.openjdk.java.net/%7Ejcbeyler/8210665/webrev.00/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp.udiff.html
+ watches[i].fid = env->GetStaticFieldID(
+ cls, watches[i].f_name, watches[i].f_sig);
. . .
+ watches[i].fid = env->GetFieldID(
+ cls, watches[i].f_name, watches[i].f_sig);
  It is better to make the above one-liners.


http://cr.openjdk.java.net/%7Ejcbeyler/8210665/webrev.00/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp.udiff.html
+ watches[i].fid = env->GetStaticFieldID(
+ cls, watches[i].f_name, watches[i].f_sig);
. . .
+ watches[i].fid = env->GetFieldID(
+ cls, watches[i].f_name, watches[i].f_sig);
  It is better to make the above one-liners.

http://cr.openjdk.java.net/%7Ejcbeyler/8210665/webrev.00/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp.udiff.html
+ mid = env->GetStaticMethodID(
+ cls, "run", "([Ljava/lang/String;Ljava/io/PrintStream;)I");
  It is better to make the above one-liner.