changeset 52933:c05ba185a1d3

8214417: Add space after/before {} in vmTestbase/nsk/jvmti/[A-I] tests Summary: Fix the spaces around {} Reviewed-by: amenkov, sspitsyn, dholmes
author jcbeyler
date Thu, 29 Nov 2018 18:57:18 -0800
parents d488477865c0
children 7d3391e9df19
files test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/Breakpoint/breakpoint001/breakpoint001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassPrepare/classprep001/classprep001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/FramePop/framepop001/framepop001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAllThreads/allthr001/allthr001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc001/methloc001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr001/getstacktr001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr003/getstacktr003.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr004/getstacktr004.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr005/getstacktr005.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr006/getstacktr006.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr007/getstacktr007.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr008/getstacktr008.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadInfo/thrinfo001/thrinfo001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp
diffstat 40 files changed, 481 insertions(+), 481 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -52,7 +52,7 @@
 static jvmtiEvent testEvents[] = {
         JVMTI_EVENT_CLASS_LOAD,
         JVMTI_EVENT_CLASS_PREPARE,
-        JVMTI_EVENT_CLASS_FILE_LOAD_HOOK};
+        JVMTI_EVENT_CLASS_FILE_LOAD_HOOK };
 
 static const int testEventsNumber = 3;
 
@@ -70,7 +70,7 @@
 int registerNativeMethods(JNIEnv* jni) {
     jclass appClass;
     JNINativeMethod nativeMethods[] = {
-            {(char*) "agentGotCapabilities", (char*) "()Z", (void*) Java_nsk_jvmti_AttachOnDemand_attach002_attach002Target_agentGotCapabilities}};
+            { (char*) "agentGotCapabilities", (char*) "()Z", (void*) Java_nsk_jvmti_AttachOnDemand_attach002_attach002Target_agentGotCapabilities } };
     jint nativeMethodsNumber = 1;
 
     appClass = jni->FindClass(ATTACH002_TARGET_APP_CLASS_NAME);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -43,7 +43,7 @@
 static Options* options = NULL;
 static const char* agentName;
 
-static jvmtiEvent testEvents[] = {JVMTI_EVENT_VM_OBJECT_ALLOC};
+static jvmtiEvent testEvents[] = { JVMTI_EVENT_VM_OBJECT_ALLOC };
 
 static const int testEventsNumber = 1;
 
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -41,7 +41,7 @@
 static Options* options = NULL;
 static const char* agentName;
 
-static jvmtiEvent testEvents[] = {JVMTI_EVENT_MONITOR_CONTENDED_ENTER, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED};
+static jvmtiEvent testEvents[] = { JVMTI_EVENT_MONITOR_CONTENDED_ENTER, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED };
 static const int testEventsNumber = 2;
 
 static volatile int monitorEnter = 0;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -44,7 +44,7 @@
 static Options* options = NULL;
 static const char* agentName;
 
-static jvmtiEvent testEvents[] = {JVMTI_EVENT_GARBAGE_COLLECTION_START, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH};
+static jvmtiEvent testEvents[] = { JVMTI_EVENT_GARBAGE_COLLECTION_START, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH };
 static const int testEventsNumber = 2;
 
 static jrawMonitorID gcFinishMonitor;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -90,8 +90,8 @@
 int registerNativeMethods(JNIEnv* jni) {
     jclass appClass;
     JNINativeMethod nativeMethods[] = {
-            {(char*) "setTagFor", (char*) "(Ljava/lang/Object;)Z", (void*) Java_nsk_jvmti_AttachOnDemand_attach021_attach021Target_setTagFor},
-            {(char*) "shutdownAgent", (char*) "()V", (void*) Java_nsk_jvmti_AttachOnDemand_attach021_attach021Target_shutdownAgent}};
+            { (char*) "setTagFor", (char*) "(Ljava/lang/Object;)Z", (void*) Java_nsk_jvmti_AttachOnDemand_attach021_attach021Target_setTagFor },
+            { (char*) "shutdownAgent", (char*) "()V", (void*) Java_nsk_jvmti_AttachOnDemand_attach021_attach021Target_shutdownAgent } };
     jint nativeMethodsNumber = 2;
 
     appClass = jni->FindClass(ATTACH021_TARGET_APP_CLASS_NAME);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -36,7 +36,7 @@
 static Options* options = NULL;
 static const char* agentName;
 
-static jvmtiEvent testEvents[] = {JVMTI_EVENT_OBJECT_FREE, JVMTI_EVENT_VM_OBJECT_ALLOC};
+static jvmtiEvent testEvents[] = { JVMTI_EVENT_OBJECT_FREE, JVMTI_EVENT_VM_OBJECT_ALLOC };
 static const int testEventsNumber = 2;
 
 static volatile int taggedObjectsCounter = 0;
@@ -100,8 +100,8 @@
 int registerNativeMethods(JNIEnv* jni) {
     jclass appClass;
     JNINativeMethod nativeMethods[] = {
-            {(char*)"shutdownAgent", (char*)"(I)Z",
-            (void*) Java_nsk_jvmti_AttachOnDemand_attach022_attach022Target_shutdownAgent}};
+            { (char*)"shutdownAgent", (char*)"(I)Z",
+              (void*) Java_nsk_jvmti_AttachOnDemand_attach022_attach022Target_shutdownAgent } };
     jint nativeMethodsNumber = 1;
 
     appClass = jni->FindClass(ATTACH022_TARGET_APP_CLASS_NAME);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -41,7 +41,7 @@
 static Options* options = NULL;
 static const char* agentName;
 
-static jvmtiEvent testEvents[] = {JVMTI_EVENT_MONITOR_WAIT, JVMTI_EVENT_MONITOR_WAITED};
+static jvmtiEvent testEvents[] = { JVMTI_EVENT_MONITOR_WAIT, JVMTI_EVENT_MONITOR_WAITED };
 static const int testEventsNumber = 2;
 
 volatile int monitorWaitReceived = 0;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -41,7 +41,7 @@
 static Options* options = NULL;
 static const char* agentName;
 
-static jvmtiEvent testEvents[] = {JVMTI_EVENT_THREAD_START, JVMTI_EVENT_THREAD_END};
+static jvmtiEvent testEvents[] = { JVMTI_EVENT_THREAD_START, JVMTI_EVENT_THREAD_END };
 static const int testEventsNumber = 2;
 
 static volatile int threadStartReceived = 0;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -43,7 +43,7 @@
 static Options* options = NULL;
 static const char* agentName;
 
-static jvmtiEvent testEvents[] = {JVMTI_EVENT_THREAD_START, JVMTI_EVENT_THREAD_END};
+static jvmtiEvent testEvents[] = { JVMTI_EVENT_THREAD_START, JVMTI_EVENT_THREAD_END };
 static const int testEventsNumber = 2;
 
 volatile int threadStartReceived = 0;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -41,7 +41,7 @@
 static Options* options = NULL;
 static const char* agentName;
 
-static jvmtiEvent testEvents[] = {JVMTI_EVENT_THREAD_START, JVMTI_EVENT_THREAD_END};
+static jvmtiEvent testEvents[] = { JVMTI_EVENT_THREAD_START, JVMTI_EVENT_THREAD_END };
 static const int testEventsNumber = 2;
 
 static jrawMonitorID eventsCounterMonitor;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -40,7 +40,7 @@
 static Options* options = NULL;
 static const char* agentName;
 
-static jvmtiEvent testEvents[] = {JVMTI_EVENT_VM_OBJECT_ALLOC};
+static jvmtiEvent testEvents[] = { JVMTI_EVENT_VM_OBJECT_ALLOC };
 static const int testEventsNumber = 1;
 
 static jrawMonitorID eventsCounterMonitor;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Breakpoint/breakpoint001/breakpoint001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Breakpoint/breakpoint001/breakpoint001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -38,8 +38,8 @@
 
 #define METH_NUM 2
 static const char *METHODS[][2] = {
-    {"bpMethod", "()V"},
-    {"bpMethod2", "()I"}
+    { "bpMethod", "()V" },
+    { "bpMethod2", "()I" }
 };
 
 static const char *CLASS_SIG =
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassPrepare/classprep001/classprep001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassPrepare/classprep001/classprep001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -59,8 +59,8 @@
 static size_t eventsCount = 0;
 static size_t eventsExpected = 0;
 static class_info classes[] = {
-    {"Lnsk/jvmti/ClassPrepare/classprep001$TestInterface;", EXP_STATUS, 2, 1, 0},
-    {"Lnsk/jvmti/ClassPrepare/classprep001$TestClass;", EXP_STATUS, 3, 2, 1}
+    { "Lnsk/jvmti/ClassPrepare/classprep001$TestInterface;", EXP_STATUS, 2, 1, 0 },
+    { "Lnsk/jvmti/ClassPrepare/classprep001$TestClass;", EXP_STATUS, 3, 2, 1 }
 };
 
 void printStatus(jint status) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -47,12 +47,12 @@
 static jint result = PASSED;
 static jfieldID thrown_fid = NULL;
 static field fields[] = {
-    {"nsk/jvmti/ClearFieldAccessWatch/clrfldw001", "fld0", "I", 0, NULL},
-    {"nsk/jvmti/ClearFieldAccessWatch/clrfldw001", "fld1", "I", 1, NULL},
-    {"nsk/jvmti/ClearFieldAccessWatch/clrfldw001", "fld2",
-        "Lnsk/jvmti/ClearFieldAccessWatch/clrfldw001a;", 0, NULL},
-    {"nsk/jvmti/ClearFieldAccessWatch/clrfldw001a", "fld3", "[I", 0, NULL},
-    {"nsk/jvmti/ClearFieldAccessWatch/clrfldw001b", "fld4", "F", 0, NULL},
+    { "nsk/jvmti/ClearFieldAccessWatch/clrfldw001", "fld0", "I", 0, NULL },
+    { "nsk/jvmti/ClearFieldAccessWatch/clrfldw001", "fld1", "I", 1, NULL },
+    { "nsk/jvmti/ClearFieldAccessWatch/clrfldw001", "fld2",
+      "Lnsk/jvmti/ClearFieldAccessWatch/clrfldw001a;", 0, NULL },
+    { "nsk/jvmti/ClearFieldAccessWatch/clrfldw001a", "fld3", "[I", 0, NULL },
+    { "nsk/jvmti/ClearFieldAccessWatch/clrfldw001b", "fld4", "F", 0, NULL },
 };
 
 void switchWatch(JNIEnv *env, jint ind, jboolean on) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -47,12 +47,12 @@
 static jint result = PASSED;
 static jfieldID thrown_fid = NULL;
 static field fields[] = {
-    {"nsk/jvmti/ClearFieldModificationWatch/clrfmodw001", "fld0", "I", 0, NULL},
-    {"nsk/jvmti/ClearFieldModificationWatch/clrfmodw001", "fld1", "I", 1, NULL},
-    {"nsk/jvmti/ClearFieldModificationWatch/clrfmodw001", "fld2",
-        "Lnsk/jvmti/ClearFieldModificationWatch/clrfmodw001a;", 0, NULL},
-    {"nsk/jvmti/ClearFieldModificationWatch/clrfmodw001a", "fld3", "[I", 0, NULL},
-    {"nsk/jvmti/ClearFieldModificationWatch/clrfmodw001b", "fld4", "F", 0, NULL},
+    { "nsk/jvmti/ClearFieldModificationWatch/clrfmodw001", "fld0", "I", 0, NULL },
+    { "nsk/jvmti/ClearFieldModificationWatch/clrfmodw001", "fld1", "I", 1, NULL },
+    { "nsk/jvmti/ClearFieldModificationWatch/clrfmodw001", "fld2",
+      "Lnsk/jvmti/ClearFieldModificationWatch/clrfmodw001a;", 0, NULL },
+    { "nsk/jvmti/ClearFieldModificationWatch/clrfmodw001a", "fld3", "[I", 0, NULL },
+    { "nsk/jvmti/ClearFieldModificationWatch/clrfmodw001b", "fld4", "F", 0, NULL },
 };
 
 void switchWatch(JNIEnv *env, jint ind, jboolean on) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/FramePop/framepop001/framepop001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/FramePop/framepop001/framepop001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -49,8 +49,8 @@
 static size_t eventsExpected = 0;
 static size_t eventsCount = 0;
 static pop_info pops[] = {
-    {"Lnsk/jvmti/FramePop/framepop001;", "chain", "()V", 0},
-    {"Lnsk/jvmti/FramePop/framepop001a;", "dummy", "()V", 3},
+    { "Lnsk/jvmti/FramePop/framepop001;", "chain", "()V", 0 },
+    { "Lnsk/jvmti/FramePop/framepop001a;", "dummy", "()V", 3 },
 };
 
 void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAllThreads/allthr001/allthr001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAllThreads/allthr001/allthr001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -46,11 +46,11 @@
 static jint result = PASSED;
 static jvmtiThreadInfo inf;
 static int sys_cnt;
-static const char *names0[] = {"main"};
-static const char *names1[] = {"main", "thread1"};
-static const char *names2[] = {"main", "Thread-"};
+static const char *names0[] = { "main" };
+static const char *names1[] = { "main", "thread1" };
+static const char *names2[] = { "main", "Thread-" };
 static info thrInfo[] = {
-    {1, names0}, {1, names0}, {2, names1}, {1, names0}, {2, names2}
+    { 1, names0 }, { 1, names0 }, { 2, names1 }, { 1, names0 }, { 2, names2 }
 };
 
 jthread jthr(JNIEnv *env) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -46,13 +46,13 @@
 static jint result = PASSED;
 static jboolean printdump = JNI_FALSE;
 
-static unsigned char m0[] = {0x2A, 0xB7, 0x00, 0x01, 0xB1};
-static unsigned char m1[] = {0xB1};
-static unsigned char m2[] = {0x1A, 0xBC, 0x06, 0x4C, 0x2B, 0xB0};
+static unsigned char m0[] = { 0x2A, 0xB7, 0x00, 0x01, 0xB1 };
+static unsigned char m1[] = { 0xB1 };
+static unsigned char m2[] = { 0x1A, 0xBC, 0x06, 0x4C, 0x2B, 0xB0 };
 static info meth_tab[3] = {
-    {"<init>", "()V",   JNI_FALSE, 5, m0},
-    {"meth1",  "()V",   JNI_FALSE, 1, m1},
-    {"meth2",  "(I)[F", JNI_TRUE,  6, m2}
+    { "<init>", "()V",   JNI_FALSE, 5, m0 },
+    { "meth1",  "()V",   JNI_FALSE, 1, m1 },
+    { "meth2",  "(I)[F", JNI_TRUE,  6, m2 }
 };
 
 #ifdef STATIC_BUILD
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -53,211 +53,211 @@
 static jboolean printdump = JNI_FALSE;
 static int eventsCount = 0;
 static opcode_info opcodes[] = {
-    {"nop", 0, 1},
-    {"aconst_null", 1, 1},
-    {"iconst_m1", 2, 1},
-    {"iconst_0", 3, 1},
-    {"iconst_1", 4, 1},
-    {"iconst_2", 5, 1},
-    {"iconst_3", 6, 1},
-    {"iconst_4", 7, 1},
-    {"iconst_5", 8, 1},
-    {"lconst_0", 9, 1},
-    {"lconst_1", 10, 1},
-    {"fconst_0", 11, 1},
-    {"fconst_1", 12, 1},
-    {"fconst_2", 13, 1},
-    {"dconst_0", 14, 1},
-    {"dconst_1", 15, 1},
-    {"bipush", 16, 2},
-    {"sipush", 17, 3},
-    {"ldc", 18, 2},
-    {"ldc_w", 19, 3},
-    {"ldc2_w", 20, 3},
-    {"iload", 21, 2},
-    {"lload", 22, 2},
-    {"fload", 23, 2},
-    {"dload", 24, 2},
-    {"aload", 25, 2},
-    {"iload_0", 26, 1},
-    {"iload_1", 27, 1},
-    {"iload_2", 28, 1},
-    {"iload_3", 29, 1},
-    {"lload_0", 30, 1},
-    {"lload_1", 31, 1},
-    {"lload_2", 32, 1},
-    {"lload_3", 33, 1},
-    {"fload_0", 34, 1},
-    {"fload_1", 35, 1},
-    {"fload_2", 36, 1},
-    {"fload_3", 37, 1},
-    {"dload_0", 38, 1},
-    {"dload_1", 39, 1},
-    {"dload_2", 40, 1},
-    {"dload_3", 41, 1},
-    {"aload_0", 42, 1},
-    {"aload_1", 43, 1},
-    {"aload_2", 44, 1},
-    {"aload_3", 45, 1},
-    {"iaload", 46, 1},
-    {"laload", 47, 1},
-    {"faload", 48, 1},
-    {"daload", 49, 1},
-    {"aaload", 50, 1},
-    {"baload", 51, 1},
-    {"caload", 52, 1},
-    {"saload", 53, 1},
-    {"istore", 54, 2},
-    {"lstore", 55, 2},
-    {"fstore", 56, 2},
-    {"dstore", 57, 2},
-    {"astore", 58, 2},
-    {"istore_0", 59, 1},
-    {"istore_1", 60, 1},
-    {"istore_2", 61, 1},
-    {"istore_3", 62, 1},
-    {"lstore_0", 63, 1},
-    {"lstore_1", 64, 1},
-    {"lstore_2", 65, 1},
-    {"lstore_3", 66, 1},
-    {"fstore_0", 67, 1},
-    {"fstore_1", 68, 1},
-    {"fstore_2", 69, 1},
-    {"fstore_3", 70, 1},
-    {"dstore_0", 71, 1},
-    {"dstore_1", 72, 1},
-    {"dstore_2", 73, 1},
-    {"dstore_3", 74, 1},
-    {"astore_0", 75, 1},
-    {"astore_1", 76, 1},
-    {"astore_2", 77, 1},
-    {"astore_3", 78, 1},
-    {"iastore", 79, 1},
-    {"lastore", 80, 1},
-    {"fastore", 81, 1},
-    {"dastore", 82, 1},
-    {"aastore", 83, 1},
-    {"bastore", 84, 1},
-    {"castore", 85, 1},
-    {"sastore", 86, 1},
-    {"pop", 87, 1},
-    {"pop2", 88, 1},
-    {"dup", 89, 1},
-    {"dup_x1", 90, 1},
-    {"dup_x2", 91, 1},
-    {"dup2", 92, 1},
-    {"dup2_x1", 93, 1},
-    {"dup2_x2", 94, 1},
-    {"swap", 95, 1},
-    {"iadd", 96, 1},
-    {"ladd", 97, 1},
-    {"fadd", 98, 1},
-    {"dadd", 99, 1},
-    {"isub", 100, 1},
-    {"lsub", 101, 1},
-    {"fsub", 102, 1},
-    {"dsub", 103, 1},
-    {"imul", 104, 1},
-    {"lmul", 105, 1},
-    {"fmul", 106, 1},
-    {"dmul", 107, 1},
-    {"idiv", 108, 1},
-    {"ldiv", 109, 1},
-    {"fdiv", 110, 1},
-    {"ddiv", 111, 1},
-    {"irem", 112, 1},
-    {"lrem", 113, 1},
-    {"frem", 114, 1},
-    {"drem", 115, 1},
-    {"ineg", 116, 1},
-    {"lneg", 117, 1},
-    {"fneg", 118, 1},
-    {"dneg", 119, 1},
-    {"ishl", 120, 1},
-    {"lshl", 121, 1},
-    {"ishr", 122, 1},
-    {"lshr", 123, 1},
-    {"iushr", 124, 1},
-    {"lushr", 125, 1},
-    {"iand", 126, 1},
-    {"land", 127, 1},
-    {"ior", 128, 1},
-    {"lor", 129, 1},
-    {"ixor", 130, 1},
-    {"lxor", 131, 1},
-    {"iinc", 132, 3},
-    {"i2l", 133, 1},
-    {"i2f", 134, 1},
-    {"i2d", 135, 1},
-    {"l2i", 136, 1},
-    {"l2f", 137, 1},
-    {"l2d", 138, 1},
-    {"f2i", 139, 1},
-    {"f2l", 140, 1},
-    {"f2d", 141, 1},
-    {"d2i", 142, 1},
-    {"d2l", 143, 1},
-    {"d2f", 144, 1},
-    {"i2b", 145, 1},
-    {"i2c", 146, 1},
-    {"i2s", 147, 1},
-    {"lcmp", 148, 1},
-    {"fcmpl", 149, 1},
-    {"fcmpg", 150, 1},
-    {"dcmpl", 151, 1},
-    {"dcmpg", 152, 1},
-    {"ifeq", 153, 3},
-    {"ifne", 154, 3},
-    {"iflt", 155, 3},
-    {"ifge", 156, 3},
-    {"ifgt", 157, 3},
-    {"ifle", 158, 3},
-    {"if_icmpeq", 159, 3},
-    {"if_icmpne", 160, 3},
-    {"if_icmplt", 161, 3},
-    {"if_icmpge", 162, 3},
-    {"if_icmpgt", 163, 3},
-    {"if_icmple", 164, 3},
-    {"if_acmpeq", 165, 3},
-    {"if_acmpne", 166, 3},
-    {"goto", 167, 3},
-    {"jsr", 168, 3},
-    {"ret", 169, 2},
-    {"tableswitch", 170, 0},
-    {"lookupswitch", 171, 0},
-    {"ireturn", 172, 1},
-    {"lreturn", 173, 1},
-    {"freturn", 174, 1},
-    {"dreturn", 175, 1},
-    {"areturn", 176, 1},
-    {"return", 177, 1},
-    {"getstatic", 178, 3},
-    {"putstatic", 179, 3},
-    {"getfield", 180, 3},
-    {"putfield", 181, 3},
-    {"invokevirtual", 182, 3},
-    {"invokespecial", 183, 3},
-    {"invokestatic", 184, 3},
-    {"invokeinterface", 185, 5},
-    {"invokedynamic", 186, 5},
-    {"new", 187, 3},
-    {"newarray", 188, 2},
-    {"anewarray", 189, 3},
-    {"arraylength", 190, 1},
-    {"athrow", 191, 1},
-    {"checkcast", 192, 3},
-    {"instanceof", 193, 3},
-    {"monitorenter", 194, 1},
-    {"monitorexit", 195, 1},
-    {"wide", 196, 0},
-    {"multianewarray", 197, 4},
-    {"ifnull", 198, 3},
-    {"ifnonnull", 199, 3},
-    {"goto_w", 200, 5},
-    {"jsr_w", 201, 5},
-    {"breakpoint", 202, 1},
-    {"impdep1", 254, 1},
-    {"impdep2", 255, 1}
+    { "nop", 0, 1 },
+    { "aconst_null", 1, 1 },
+    { "iconst_m1", 2, 1 },
+    { "iconst_0", 3, 1 },
+    { "iconst_1", 4, 1 },
+    { "iconst_2", 5, 1 },
+    { "iconst_3", 6, 1 },
+    { "iconst_4", 7, 1 },
+    { "iconst_5", 8, 1 },
+    { "lconst_0", 9, 1 },
+    { "lconst_1", 10, 1 },
+    { "fconst_0", 11, 1 },
+    { "fconst_1", 12, 1 },
+    { "fconst_2", 13, 1 },
+    { "dconst_0", 14, 1 },
+    { "dconst_1", 15, 1 },
+    { "bipush", 16, 2 },
+    { "sipush", 17, 3 },
+    { "ldc", 18, 2 },
+    { "ldc_w", 19, 3 },
+    { "ldc2_w", 20, 3 },
+    { "iload", 21, 2 },
+    { "lload", 22, 2 },
+    { "fload", 23, 2 },
+    { "dload", 24, 2 },
+    { "aload", 25, 2 },
+    { "iload_0", 26, 1 },
+    { "iload_1", 27, 1 },
+    { "iload_2", 28, 1 },
+    { "iload_3", 29, 1 },
+    { "lload_0", 30, 1 },
+    { "lload_1", 31, 1 },
+    { "lload_2", 32, 1 },
+    { "lload_3", 33, 1 },
+    { "fload_0", 34, 1 },
+    { "fload_1", 35, 1 },
+    { "fload_2", 36, 1 },
+    { "fload_3", 37, 1 },
+    { "dload_0", 38, 1 },
+    { "dload_1", 39, 1 },
+    { "dload_2", 40, 1 },
+    { "dload_3", 41, 1 },
+    { "aload_0", 42, 1 },
+    { "aload_1", 43, 1 },
+    { "aload_2", 44, 1 },
+    { "aload_3", 45, 1 },
+    { "iaload", 46, 1 },
+    { "laload", 47, 1 },
+    { "faload", 48, 1 },
+    { "daload", 49, 1 },
+    { "aaload", 50, 1 },
+    { "baload", 51, 1 },
+    { "caload", 52, 1 },
+    { "saload", 53, 1 },
+    { "istore", 54, 2 },
+    { "lstore", 55, 2 },
+    { "fstore", 56, 2 },
+    { "dstore", 57, 2 },
+    { "astore", 58, 2 },
+    { "istore_0", 59, 1 },
+    { "istore_1", 60, 1 },
+    { "istore_2", 61, 1 },
+    { "istore_3", 62, 1 },
+    { "lstore_0", 63, 1 },
+    { "lstore_1", 64, 1 },
+    { "lstore_2", 65, 1 },
+    { "lstore_3", 66, 1 },
+    { "fstore_0", 67, 1 },
+    { "fstore_1", 68, 1 },
+    { "fstore_2", 69, 1 },
+    { "fstore_3", 70, 1 },
+    { "dstore_0", 71, 1 },
+    { "dstore_1", 72, 1 },
+    { "dstore_2", 73, 1 },
+    { "dstore_3", 74, 1 },
+    { "astore_0", 75, 1 },
+    { "astore_1", 76, 1 },
+    { "astore_2", 77, 1 },
+    { "astore_3", 78, 1 },
+    { "iastore", 79, 1 },
+    { "lastore", 80, 1 },
+    { "fastore", 81, 1 },
+    { "dastore", 82, 1 },
+    { "aastore", 83, 1 },
+    { "bastore", 84, 1 },
+    { "castore", 85, 1 },
+    { "sastore", 86, 1 },
+    { "pop", 87, 1 },
+    { "pop2", 88, 1 },
+    { "dup", 89, 1 },
+    { "dup_x1", 90, 1 },
+    { "dup_x2", 91, 1 },
+    { "dup2", 92, 1 },
+    { "dup2_x1", 93, 1 },
+    { "dup2_x2", 94, 1 },
+    { "swap", 95, 1 },
+    { "iadd", 96, 1 },
+    { "ladd", 97, 1 },
+    { "fadd", 98, 1 },
+    { "dadd", 99, 1 },
+    { "isub", 100, 1 },
+    { "lsub", 101, 1 },
+    { "fsub", 102, 1 },
+    { "dsub", 103, 1 },
+    { "imul", 104, 1 },
+    { "lmul", 105, 1 },
+    { "fmul", 106, 1 },
+    { "dmul", 107, 1 },
+    { "idiv", 108, 1 },
+    { "ldiv", 109, 1 },
+    { "fdiv", 110, 1 },
+    { "ddiv", 111, 1 },
+    { "irem", 112, 1 },
+    { "lrem", 113, 1 },
+    { "frem", 114, 1 },
+    { "drem", 115, 1 },
+    { "ineg", 116, 1 },
+    { "lneg", 117, 1 },
+    { "fneg", 118, 1 },
+    { "dneg", 119, 1 },
+    { "ishl", 120, 1 },
+    { "lshl", 121, 1 },
+    { "ishr", 122, 1 },
+    { "lshr", 123, 1 },
+    { "iushr", 124, 1 },
+    { "lushr", 125, 1 },
+    { "iand", 126, 1 },
+    { "land", 127, 1 },
+    { "ior", 128, 1 },
+    { "lor", 129, 1 },
+    { "ixor", 130, 1 },
+    { "lxor", 131, 1 },
+    { "iinc", 132, 3 },
+    { "i2l", 133, 1 },
+    { "i2f", 134, 1 },
+    { "i2d", 135, 1 },
+    { "l2i", 136, 1 },
+    { "l2f", 137, 1 },
+    { "l2d", 138, 1 },
+    { "f2i", 139, 1 },
+    { "f2l", 140, 1 },
+    { "f2d", 141, 1 },
+    { "d2i", 142, 1 },
+    { "d2l", 143, 1 },
+    { "d2f", 144, 1 },
+    { "i2b", 145, 1 },
+    { "i2c", 146, 1 },
+    { "i2s", 147, 1 },
+    { "lcmp", 148, 1 },
+    { "fcmpl", 149, 1 },
+    { "fcmpg", 150, 1 },
+    { "dcmpl", 151, 1 },
+    { "dcmpg", 152, 1 },
+    { "ifeq", 153, 3 },
+    { "ifne", 154, 3 },
+    { "iflt", 155, 3 },
+    { "ifge", 156, 3 },
+    { "ifgt", 157, 3 },
+    { "ifle", 158, 3 },
+    { "if_icmpeq", 159, 3 },
+    { "if_icmpne", 160, 3 },
+    { "if_icmplt", 161, 3 },
+    { "if_icmpge", 162, 3 },
+    { "if_icmpgt", 163, 3 },
+    { "if_icmple", 164, 3 },
+    { "if_acmpeq", 165, 3 },
+    { "if_acmpne", 166, 3 },
+    { "goto", 167, 3 },
+    { "jsr", 168, 3 },
+    { "ret", 169, 2 },
+    { "tableswitch", 170, 0 },
+    { "lookupswitch", 171, 0 },
+    { "ireturn", 172, 1 },
+    { "lreturn", 173, 1 },
+    { "freturn", 174, 1 },
+    { "dreturn", 175, 1 },
+    { "areturn", 176, 1 },
+    { "return", 177, 1 },
+    { "getstatic", 178, 3 },
+    { "putstatic", 179, 3 },
+    { "getfield", 180, 3 },
+    { "putfield", 181, 3 },
+    { "invokevirtual", 182, 3 },
+    { "invokespecial", 183, 3 },
+    { "invokestatic", 184, 3 },
+    { "invokeinterface", 185, 5 },
+    { "invokedynamic", 186, 5 },
+    { "new", 187, 3 },
+    { "newarray", 188, 2 },
+    { "anewarray", 189, 3 },
+    { "arraylength", 190, 1 },
+    { "athrow", 191, 1 },
+    { "checkcast", 192, 3 },
+    { "instanceof", 193, 3 },
+    { "monitorenter", 194, 1 },
+    { "monitorexit", 195, 1 },
+    { "wide", 196, 0 },
+    { "multianewarray", 197, 4 },
+    { "ifnull", 198, 3 },
+    { "ifnonnull", 199, 3 },
+    { "goto_w", 200, 5 },
+    { "jsr_w", 201, 5 },
+    { "breakpoint", 202, 1 },
+    { "impdep1", 254, 1 },
+    { "impdep2", 255, 1 }
 };
 
 jint get_u4(unsigned char *p) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -49,52 +49,52 @@
 static jboolean printdump = JNI_FALSE;
 
 static fld_info f0[] = {
-    {"fld_1", "Ljava/lang/String;"}
+    { "fld_1", "Ljava/lang/String;" }
 };
 
 static fld_info f1[] = {
-    {"fld_n1", "I"}
+    { "fld_n1", "I" }
 };
 
 static fld_info f2[] = {
-    {"fld_n2", "I"}
+    { "fld_n2", "I" }
 };
 
 static fld_info f4[] = {
-    {"fld_o2", "I"}
+    { "fld_o2", "I" }
 };
 
 static fld_info f5[] = {
-    {"fld_o3", "I"}
+    { "fld_o3", "I" }
 };
 
 static fld_info f6[] = {
-    {"fld_i1", "I"}
+    { "fld_i1", "I" }
 };
 
 static fld_info f7[] = {
-    {"fld_i2", "I"}
+    { "fld_i2", "I" }
 };
 
 static fld_info f8[] = {
-    {"fld_i2", "I"}
+    { "fld_i2", "I" }
 };
 
 static fld_info f9[] = {
-    {"fld_i1", "I"}
+    { "fld_i1", "I" }
 };
 
 static class_info classes[] = {
-    {"InnerClass1", 1, f0},
-    {"InnerInterface", 1, f1},
-    {"InnerClass2", 1, f2},
-    {"OuterClass1", 0, NULL},
-    {"OuterClass2", 1, f4},
-    {"OuterClass3", 1, f5},
-    {"OuterInterface1", 1, f6},
-    {"OuterInterface2", 1, f7},
-    {"OuterClass4", 1, f8},
-    {"OuterClass5", 1, f9}
+    { "InnerClass1", 1, f0 },
+    { "InnerInterface", 1, f1 },
+    { "InnerClass2", 1, f2 },
+    { "OuterClass1", 0, NULL },
+    { "OuterClass2", 1, f4 },
+    { "OuterClass3", 1, f5 },
+    { "OuterInterface1", 1, f6 },
+    { "OuterInterface2", 1, f7 },
+    { "OuterClass4", 1, f8 },
+    { "OuterClass5", 1, f9 }
 };
 
 #ifdef STATIC_BUILD
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -49,64 +49,64 @@
 static jboolean printdump = JNI_FALSE;
 
 static meth_info m0[] = {
-    {"<init>", "(Lnsk/jvmti/GetClassMethods/getclmthd007;)V"},
-    {"meth_1", "(Ljava/lang/String;)V"}
+    { "<init>", "(Lnsk/jvmti/GetClassMethods/getclmthd007;)V" },
+    { "meth_1", "(Ljava/lang/String;)V" }
 };
 
 static meth_info m1[] = {
-    {"meth_n1", "()V"}
+    { "meth_n1", "()V" }
 };
 
 static meth_info m2[] = {
-    {"<init>", "()V"},
-    {"meth_n1", "()V"},
-    {"meth_n2", "()I"},
-    {"<clinit>", "()V"}
+    { "<init>", "()V" },
+    { "meth_n1", "()V" },
+    { "meth_n2", "()I" },
+    { "<clinit>", "()V" }
 };
 
 static meth_info m3[] = {
-    {"<init>", "()V"}
+    { "<init>", "()V" }
 };
 
 static meth_info m4[] = {
-    {"<init>", "()V"},
-    {"meth_o2", "()V"}
+    { "<init>", "()V" },
+    { "meth_o2", "()V" }
 };
 
 static meth_info m5[] = {
-    {"<init>", "()V"},
-    {"meth_o3", "()I"}
+    { "<init>", "()V" },
+    { "meth_o3", "()I" }
 };
 
 static meth_info m6[] = {
-    {"meth_i1", "()I"}
+    { "meth_i1", "()I" }
 };
 
 static meth_info m7[] = {
-    {"meth_i2", "()I"}
+    { "meth_i2", "()I" }
 };
 
 static meth_info m8[] = {
-    {"<init>", "()V"},
-    {"meth_i2", "()I"}
+    { "<init>", "()V" },
+    { "meth_i2", "()I" }
 };
 
 static meth_info m9[] = {
-    {"<init>", "()V"},
-    {"meth_i1", "()I"}
+    { "<init>", "()V" },
+    { "meth_i1", "()I" }
 };
 
 static class_info classes[] = {
-    {"InnerClass1", 2, m0},
-    {"InnerInterface", 1, m1},
-    {"InnerClass2", 4, m2},
-    {"OuterClass1", 1, m3},
-    {"OuterClass2", 2, m4},
-    {"OuterClass3", 2, m5},
-    {"OuterInterface1", 1, m6},
-    {"OuterInterface2", 1, m7},
-    {"OuterClass4", 2, m8},
-    {"OuterClass5", 2, m9}
+    { "InnerClass1", 2, m0 },
+    { "InnerInterface", 1, m1 },
+    { "InnerClass2", 4, m2 },
+    { "OuterClass1", 1, m3 },
+    { "OuterClass2", 2, m4 },
+    { "OuterClass3", 2, m5 },
+    { "OuterInterface1", 1, m6 },
+    { "OuterInterface2", 1, m7 },
+    { "OuterClass4", 2, m8 },
+    { "OuterClass5", 2, m9 }
 };
 
 #ifdef STATIC_BUILD
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -40,15 +40,15 @@
 
 /* expected class signatures are below */
 static const char *class_sig[][CLS_NUM] = {
-    {"getclsig006", "Lnsk/jvmti/GetClassSignature/getclsig006;", "NULL"},
-    {"getclsig006b", "Lnsk/jvmti/GetClassSignature/getclsig006b;",
-        "<L:Ljava/lang/String;>Ljava/lang/Object;"},
-    {"getclsig006c", "Lnsk/jvmti/GetClassSignature/getclsig006c;",
-        "<A:Ljava/lang/Object;B:Ljava/lang/Integer;>Ljava/lang/Object;"},
-    {"getclsig006if", "Lnsk/jvmti/GetClassSignature/getclsig006if;",
-        "<I:Ljava/lang/Object;>Ljava/lang/Object;"},
-    {"getclsig006g", "Lnsk/jvmti/GetClassSignature/getclsig006g;",
-        "<E:Lnsk/jvmti/GetClassSignature/getclsig006e;:Lnsk/jvmti/GetClassSignature/getclsig006if;>Ljava/lang/Object;"}
+    { "getclsig006", "Lnsk/jvmti/GetClassSignature/getclsig006;", "NULL" },
+    { "getclsig006b", "Lnsk/jvmti/GetClassSignature/getclsig006b;",
+      "<L:Ljava/lang/String;>Ljava/lang/Object;" },
+    { "getclsig006c", "Lnsk/jvmti/GetClassSignature/getclsig006c;",
+      "<A:Ljava/lang/Object;B:Ljava/lang/Integer;>Ljava/lang/Object;" },
+    { "getclsig006if", "Lnsk/jvmti/GetClassSignature/getclsig006if;",
+      "<I:Ljava/lang/Object;>Ljava/lang/Object;" },
+    { "getclsig006g", "Lnsk/jvmti/GetClassSignature/getclsig006g;",
+      "<E:Lnsk/jvmti/GetClassSignature/getclsig006e;:Lnsk/jvmti/GetClassSignature/getclsig006if;>Ljava/lang/Object;" }
 };
 
 static jvmtiEnv *jvmti = NULL;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -48,37 +48,37 @@
 static jboolean printdump = JNI_FALSE;
 
 static iface_info i2[] = {
-    {"Lnsk/jvmti/GetImplementedInterfaces/getintrf007$InnerInterface1;"}
+    { "Lnsk/jvmti/GetImplementedInterfaces/getintrf007$InnerInterface1;" }
 };
 
 static iface_info i3[] = {
-    {"Lnsk/jvmti/GetImplementedInterfaces/getintrf007$InnerInterface2;"}
+    { "Lnsk/jvmti/GetImplementedInterfaces/getintrf007$InnerInterface2;" }
 };
 
 static iface_info i7[] = {
-    {"Lnsk/jvmti/GetImplementedInterfaces/OuterInterface1;"}
+    { "Lnsk/jvmti/GetImplementedInterfaces/OuterInterface1;" }
 };
 
 static iface_info i8[] = {
-    {"Lnsk/jvmti/GetImplementedInterfaces/OuterInterface1;"}
+    { "Lnsk/jvmti/GetImplementedInterfaces/OuterInterface1;" }
 };
 
 static iface_info i9[] = {
-    {"Lnsk/jvmti/GetImplementedInterfaces/OuterInterface2;"}
+    { "Lnsk/jvmti/GetImplementedInterfaces/OuterInterface2;" }
 };
 
 static class_info classes[] = {
-    {"InnerClass1", 0, NULL},
-    {"InnerInterface1", 0, NULL},
-    {"InnerInterface2", 1, i2},
-    {"InnerClass2", 1, i3},
-    {"OuterClass1", 0, NULL},
-    {"OuterClass2", 0, NULL},
-    {"OuterInterface1", 0, NULL},
-    {"OuterClass3", 1, i7},
-    {"OuterInterface2", 1, i8},
-    {"OuterClass4", 1, i9},
-    {"OuterClass5", 0, NULL}
+    { "InnerClass1", 0, NULL },
+    { "InnerInterface1", 0, NULL },
+    { "InnerInterface2", 1, i2 },
+    { "InnerClass2", 1, i3 },
+    { "OuterClass1", 0, NULL },
+    { "OuterClass2", 0, NULL },
+    { "OuterInterface1", 0, NULL },
+    { "OuterClass3", 1, i7 },
+    { "OuterInterface2", 1, i8 },
+    { "OuterClass4", 1, i9 },
+    { "OuterClass5", 0, NULL }
 };
 
 #ifdef STATIC_BUILD
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -42,15 +42,15 @@
 static jvmtiCapabilities caps;
 static jint result = PASSED;
 static jvmtiLineNumberEntry m0[] = {
-    {0, 64}
+    { 0, 64 }
 };
 static jvmtiLineNumberEntry m1[] = {
-    {0, 67},
-    {4, 68},
-    {7, 69},
-    {12,70}
+    { 0, 67 },
+    { 4, 68 },
+    { 7, 69 },
+    { 12,70 }
 };
-static info meth_tab[] = {{1, m0}, {4, m1}};
+static info meth_tab[] = { { 1, m0 }, { 4, m1 } };
 
 void checkMeth(JNIEnv *env, jclass cl, const char *name, const char *sig,
                int stat, int meth_ind) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -42,53 +42,53 @@
 static jvmtiCapabilities caps;
 static jint result = PASSED;
 static jvmtiLocalVariableEntry m1[] = {
-    {0, 21, (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0},
-    {4, 17, (char*) "l",    (char*) "J", NULL, 1},
-    {7, 14, (char*) "f",    (char*) "F", NULL, 2},
-    {12, 9, (char*) "d",    (char*) "D", NULL, 3}
+    { 0, 21, (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0 },
+    { 4, 17, (char*) "l",    (char*) "J", NULL, 1 },
+    { 7, 14, (char*) "f",    (char*) "F", NULL, 2 },
+    { 12, 9, (char*) "d",    (char*) "D", NULL, 3 }
 };
 static jvmtiLocalVariableEntry m2[] = {
-    {0, 32, (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0},
-    {0, 32, (char*) "step", (char*) "I", NULL, 1},
-    {2, 29, (char*) "i2",   (char*) "S", NULL, 2},
-    {4, 27, (char*) "i3",   (char*) "C", NULL, 3},
-    {7, 24, (char*) "i4",   (char*) "B", NULL, 4},
-    {10,21, (char*) "i5",   (char*) "Z", NULL, 5},
-    {13,18, (char*) "i1",   (char*) "I", NULL, 6}
+    { 0, 32, (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0 },
+    { 0, 32, (char*) "step", (char*) "I", NULL, 1 },
+    { 2, 29, (char*) "i2",   (char*) "S", NULL, 2 },
+    { 4, 27, (char*) "i3",   (char*) "C", NULL, 3 },
+    { 7, 24, (char*) "i4",   (char*) "B", NULL, 4 },
+    { 10,21, (char*) "i5",   (char*) "Z", NULL, 5 },
+    { 13,18, (char*) "i1",   (char*) "I", NULL, 6 }
 };
 static jvmtiLocalVariableEntry m3[] = {
-    {0, 70, (char*) "ob",  (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0},
-    {2, 67, (char*) "ob1", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 1},
-    {56,13, (char*) "ob2", (char*) "[I", NULL, 2},
-    {61, 0, (char*) "i",   (char*) "I", NULL, 3},
-    {64, 5, (char*) "e",   (char*) "Ljava/lang/IndexOutOfBoundsException;", NULL, 4}
+    { 0, 70, (char*) "ob",  (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0 },
+    { 2, 67, (char*) "ob1", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 1 },
+    { 56,13, (char*) "ob2", (char*) "[I", NULL, 2 },
+    { 61, 0, (char*) "i",   (char*) "I", NULL, 3 },
+    { 64, 5, (char*) "e",   (char*) "Ljava/lang/IndexOutOfBoundsException;", NULL, 4 }
 };
 static jvmtiLocalVariableEntry m4[] = {
-    {0, 33, (char*) "i1", (char*) "I", NULL, 0},
-    {0, 33, (char*) "l",  (char*) "J", NULL, 1},
-    {0, 33, (char*) "i2", (char*) "S", NULL, 2},
-    {0, 33, (char*) "d",  (char*) "D", NULL, 3},
-    {0, 33, (char*) "i3", (char*) "C", NULL, 4},
-    {0, 33, (char*) "f",  (char*) "F", NULL, 5},
-    {0, 33, (char*) "i4", (char*) "B", NULL, 6},
-    {0, 33, (char*) "b",  (char*) "Z", NULL, 7}
+    { 0, 33, (char*) "i1", (char*) "I", NULL, 0 },
+    { 0, 33, (char*) "l",  (char*) "J", NULL, 1 },
+    { 0, 33, (char*) "i2", (char*) "S", NULL, 2 },
+    { 0, 33, (char*) "d",  (char*) "D", NULL, 3 },
+    { 0, 33, (char*) "i3", (char*) "C", NULL, 4 },
+    { 0, 33, (char*) "f",  (char*) "F", NULL, 5 },
+    { 0, 33, (char*) "i4", (char*) "B", NULL, 6 },
+    { 0, 33, (char*) "b",  (char*) "Z", NULL, 7 }
 };
 static jvmtiLocalVariableEntry m5[] = {
-    {0, 6, (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0},
-    {0, 6, (char*) "i",    (char*) "I", NULL, 1},
-    {2, 4, (char*) "i12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678", (char*) "I", NULL, 2}
+    { 0, 6, (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0 },
+    { 0, 6, (char*) "i",    (char*) "I", NULL, 1 },
+    { 2, 4, (char*) "i12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678", (char*) "I", NULL, 2 }
 };
 static jvmtiLocalVariableEntry m6[] = {
-    {0, 5, (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0},
+    { 0, 5, (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab001;", NULL, 0 },
 };
 static info meth_tab[] = {
-    {0, NULL},
-    {4, m1},
-    {7, m2},
-    {5, m3},
-    {8, m4},
-    {3, m5},
-    {1, m6}
+    { 0, NULL },
+    { 4, m1 },
+    { 7, m2 },
+    { 5, m3 },
+    { 8, m4 },
+    { 3, m5 },
+    { 1, m6 }
 };
 
 void checkMeth(JNIEnv *env, jclass cl, const char *name, const char *sig,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -44,30 +44,30 @@
 
 /* expected local variable info are below */
 static localVar constr_lv[] = { /* constructor's local variables */
-    {(char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab004a;"},
-    {(char*) "constr_i", (char*) "I"},
-    {(char*) "constr_l", (char*) "J"},
-    {(char*) "constr_d", (char*) "D"},
-    {(char*) "constr_f", (char*) "F"},
-    {(char*) "constr_c", (char*) "C"}
+    { (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab004a;" },
+    { (char*) "constr_i", (char*) "I" },
+    { (char*) "constr_l", (char*) "J" },
+    { (char*) "constr_d", (char*) "D" },
+    { (char*) "constr_f", (char*) "F" },
+    { (char*) "constr_c", (char*) "C" }
 };
 
 static localVar finMeth_lv[] = { /* finMethod()'s local variables */
-    {(char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab004a;"},
-    {(char*) "fin_c", (char*) "C"},
-    {(char*) "fin_i", (char*) "J"},
-    {(char*) "fin_j", (char*) "I"},
-    {(char*) "fin_k", (char*) "J"},
-    {(char*) "fin_l", (char*) "J"},
-    {(char*) "fin_f", (char*) "F"}
+    { (char*) "this", (char*) "Lnsk/jvmti/GetLocalVariableTable/localtab004a;" },
+    { (char*) "fin_c", (char*) "C" },
+    { (char*) "fin_i", (char*) "J" },
+    { (char*) "fin_j", (char*) "I" },
+    { (char*) "fin_k", (char*) "J" },
+    { (char*) "fin_l", (char*) "J" },
+    { (char*) "fin_f", (char*) "F" }
 };
 
 static localVar statMeth_lv[] = { /* statMethod()'s local variables */
-    {(char*) "stat_x", (char*) "I"},
-    {(char*) "stat_y", (char*) "I"},
-    {(char*) "stat_z", (char*) "I"},
-    {(char*) "stat_j", (char*) "D"},
-    {(char*) "stat_i", (char*) "I"}
+    { (char*) "stat_x", (char*) "I" },
+    { (char*) "stat_y", (char*) "I" },
+    { (char*) "stat_z", (char*) "I" },
+    { (char*) "stat_j", (char*) "D" },
+    { (char*) "stat_i", (char*) "I" }
 };
 
 typedef struct {    /* local variables of a method */
@@ -81,9 +81,9 @@
 
 /* list of tested methods */
 static methodInfo methInfo[] = {
-    {1, (char*) "<init>", (char*) "()V", 6, constr_lv, NULL},
-    {1, (char*) "finMethod", (char*) "(CJIJ)V", 7, finMeth_lv, NULL},
-    {0, (char*) "statMethod", (char*) "(III)D", 5, statMeth_lv, NULL}
+    { 1, (char*) "<init>", (char*) "()V", 6, constr_lv, NULL },
+    { 1, (char*) "finMethod", (char*) "(CJIJ)V", 7, finMeth_lv, NULL },
+    { 0, (char*) "statMethod", (char*) "(III)D", 5, statMeth_lv, NULL }
 };
 
 static jvmtiEnv *jvmti = NULL;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -45,37 +45,37 @@
 
 /* expected local variable info are below */
 static localVar constr_lv[] = { /* constructor's local variables */
-    {"this", "Lnsk/jvmti/GetLocalVariableTable/localtab005a;", "NULL"},
-    {"constr_b", "Lnsk/jvmti/GetLocalVariableTable/localtab005b;",
-        "Lnsk/jvmti/GetLocalVariableTable/localtab005b<Ljava/lang/String;>;"},
-    {"constr_i", "I", "NULL"},
-    {"constr_c", "Lnsk/jvmti/GetLocalVariableTable/localtab005c;",
-        "Lnsk/jvmti/GetLocalVariableTable/localtab005c<Ljava/lang/Boolean;Ljava/lang/Integer;>;"},
-    {"constr_f", "F", "NULL"},
-    {"constr_ch", "C", "NULL"},
-    {"constr_if", "Lnsk/jvmti/GetLocalVariableTable/localtab005if;",
-        "Lnsk/jvmti/GetLocalVariableTable/localtab005if<Ljava/lang/Object;>;"}
+    { "this", "Lnsk/jvmti/GetLocalVariableTable/localtab005a;", "NULL" },
+    { "constr_b", "Lnsk/jvmti/GetLocalVariableTable/localtab005b;",
+      "Lnsk/jvmti/GetLocalVariableTable/localtab005b<Ljava/lang/String;>;" },
+    { "constr_i", "I", "NULL" },
+    { "constr_c", "Lnsk/jvmti/GetLocalVariableTable/localtab005c;",
+      "Lnsk/jvmti/GetLocalVariableTable/localtab005c<Ljava/lang/Boolean;Ljava/lang/Integer;>;" },
+    { "constr_f", "F", "NULL" },
+    { "constr_ch", "C", "NULL" },
+    { "constr_if", "Lnsk/jvmti/GetLocalVariableTable/localtab005if;",
+      "Lnsk/jvmti/GetLocalVariableTable/localtab005if<Ljava/lang/Object;>;" }
 };
 
 static localVar insMeth_lv[] = { /* finMethod()'s local variables */
-    {"this", "Lnsk/jvmti/GetLocalVariableTable/localtab005a;", "NULL"},
-    {"ins_c", "C", "NULL"},
-    {"ins_i", "J", "NULL"},
-    {"ltab005d", "Lnsk/jvmti/GetLocalVariableTable/localtab005d;",
-        "Lnsk/jvmti/GetLocalVariableTable/localtab005d<Ljava/lang/Object;>;"},
-    {"ins_k", "J", "NULL"},
-    {"ins_l", "J", "NULL"},
-    {"ins_g", "Lnsk/jvmti/GetLocalVariableTable/localtab005g;",
-        "Lnsk/jvmti/GetLocalVariableTable/localtab005g<Lnsk/jvmti/GetLocalVariableTable/localtab005f;>;"}
+    { "this", "Lnsk/jvmti/GetLocalVariableTable/localtab005a;", "NULL" },
+    { "ins_c", "C", "NULL" },
+    { "ins_i", "J", "NULL" },
+    { "ltab005d", "Lnsk/jvmti/GetLocalVariableTable/localtab005d;",
+      "Lnsk/jvmti/GetLocalVariableTable/localtab005d<Ljava/lang/Object;>;" },
+    { "ins_k", "J", "NULL" },
+    { "ins_l", "J", "NULL" },
+    { "ins_g", "Lnsk/jvmti/GetLocalVariableTable/localtab005g;",
+      "Lnsk/jvmti/GetLocalVariableTable/localtab005g<Lnsk/jvmti/GetLocalVariableTable/localtab005f;>;" }
 };
 
 static localVar statMeth_lv[] = { /* statMethod()'s local variables */
-    {"stat_x", "I", "NULL"},
-    {"stat_y", "I", "NULL"},
-    {"stat_z", "I", "NULL"},
-    {"stat_j", "D", "NULL"},
-    {"stat_d", "Lnsk/jvmti/GetLocalVariableTable/localtab005d;",
-        "Lnsk/jvmti/GetLocalVariableTable/localtab005d<Ljava/lang/Byte;>;"}
+    { "stat_x", "I", "NULL" },
+    { "stat_y", "I", "NULL" },
+    { "stat_z", "I", "NULL" },
+    { "stat_j", "D", "NULL" },
+    { "stat_d", "Lnsk/jvmti/GetLocalVariableTable/localtab005d;",
+      "Lnsk/jvmti/GetLocalVariableTable/localtab005d<Ljava/lang/Byte;>;" }
 };
 
 typedef struct {    /* local variables of a method */
@@ -89,9 +89,9 @@
 
 /* list of tested methods */
 static methodInfo methInfo[] = {
-    {1, (char*) "<init>", (char*) "()V", 7, constr_lv, NULL},
-    {1, (char*) "insMethod", (char*) "(CJLnsk/jvmti/GetLocalVariableTable/localtab005d;J)V", 7, insMeth_lv, NULL},
-    {0, (char*) "statMethod", (char*) "(III)D", 5, statMeth_lv, NULL}
+    { 1, (char*) "<init>", (char*) "()V", 7, constr_lv, NULL },
+    { 1, (char*) "insMethod", (char*) "(CJLnsk/jvmti/GetLocalVariableTable/localtab005d;J)V", 7, insMeth_lv, NULL },
+    { 0, (char*) "statMethod", (char*) "(III)D", 5, statMeth_lv, NULL }
 };
 
 static jvmtiEnv *jvmti = NULL;
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc001/methloc001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc001/methloc001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -39,9 +39,9 @@
 static jvmtiEnv *jvmti;
 static jint result = PASSED;
 static info meth_tab[] = {
-    {0, 4},  /* 0 <init> */
-    {0, 0},  /* 1 meth1 */
-    {0, 5}   /* 2 meth2 */
+    { 0, 4 },  /* 0 <init> */
+    { 0, 0 },  /* 1 meth1 */
+    { 0, 5 }   /* 2 meth2 */
 };
 
 void checkMeth(JNIEnv *env, jclass cl, const char *name, const char *sig,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr001/getstacktr001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr001/getstacktr001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -43,14 +43,14 @@
 static jint result = PASSED;
 static jboolean printdump = JNI_FALSE;
 static frame_info frames[] = {
-    {"Lnsk/jvmti/GetStackTrace/getstacktr001;", "check",
-     "(Ljava/lang/Thread;)V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr001;", "dummy", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr001;", "chain", "()I"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr001;", "run",
-     "([Ljava/lang/String;Ljava/io/PrintStream;)I"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr001;", "main",
-     "([Ljava/lang/String;)V"}
+    { "Lnsk/jvmti/GetStackTrace/getstacktr001;", "check",
+     "(Ljava/lang/Thread;)V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr001;", "dummy", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr001;", "chain", "()I" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr001;", "run",
+     "([Ljava/lang/String;Ljava/io/PrintStream;)I" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr001;", "main",
+     "([Ljava/lang/String;)V" }
 };
 
 #define NUMBER_OF_STACK_FRAMES ((int) (sizeof(frames)/sizeof(frame_info)))
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr003/getstacktr003.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr003/getstacktr003.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -44,10 +44,10 @@
 static jint result = PASSED;
 static jboolean printdump = JNI_FALSE;
 static frame_info frames[] = {
-    {"Ljava/lang/Object;", "wait", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr003;", "dummy", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr003;", "chain", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr003$TestThread;", "run", "()V"},
+    { "Ljava/lang/Object;", "wait", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr003;", "dummy", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr003;", "chain", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr003$TestThread;", "run", "()V" },
 };
 
 #define NUMBER_OF_STACK_FRAMES ((int) (sizeof(frames)/sizeof(frame_info)))
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr004/getstacktr004.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr004/getstacktr004.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -46,12 +46,12 @@
 static jboolean printdump = JNI_FALSE;
 static jmethodID mid;
 static frame_info frames[] = {
-    {"Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "checkPoint", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "chain4", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "chain3", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "chain2", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "chain1", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "run", "()V"},
+    { "Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "checkPoint", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "chain4", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "chain3", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "chain2", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "chain1", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr004$TestThread;", "run", "()V" },
 };
 
 #define NUMBER_OF_STACK_FRAMES ((int) (sizeof(frames)/sizeof(frame_info)))
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr005/getstacktr005.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr005/getstacktr005.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -46,11 +46,11 @@
 static jboolean printdump = JNI_FALSE;
 static jmethodID mid;
 static frame_info frames[] = {
-    {"Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "chain4", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "chain3", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "chain2", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "chain1", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "run", "()V"},
+    { "Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "chain4", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "chain3", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "chain2", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "chain1", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr005$TestThread;", "run", "()V" },
 };
 
 #define NUMBER_OF_STACK_FRAMES ((int) (sizeof(frames)/sizeof(frame_info)))
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr006/getstacktr006.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr006/getstacktr006.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -46,11 +46,11 @@
 static jboolean printdump = JNI_FALSE;
 static jmethodID mid;
 static frame_info frames[] = {
-    {"Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "chain4", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "chain3", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "chain2", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "chain1", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "run", "()V"},
+    { "Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "chain4", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "chain3", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "chain2", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "chain1", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr006$TestThread;", "run", "()V" },
 };
 
 #define NUMBER_OF_STACK_FRAMES ((int) (sizeof(frames)/sizeof(frame_info)))
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr007/getstacktr007.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr007/getstacktr007.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -47,12 +47,12 @@
 static jmethodID mid;
 static jbyteArray classBytes;
 static frame_info frames[] = {
-    {"Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "checkPoint", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "chain4", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "chain3", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "chain2", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "chain1", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "run", "()V"},
+    { "Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "checkPoint", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "chain4", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "chain3", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "chain2", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "chain1", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr007$TestThread;", "run", "()V" },
 };
 
 #define NUMBER_OF_STACK_FRAMES ((int) (sizeof(frames)/sizeof(frame_info)))
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr008/getstacktr008.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetStackTrace/getstacktr008/getstacktr008.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -49,14 +49,14 @@
 static jmethodID mid_checkPoint, mid_chain4;
 static jbyteArray classBytes;
 static frame_info frames[] = {
-    {"Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "checkPoint", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain5", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain4", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr008;", "nativeChain", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain3", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain2", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain1", "()V"},
-    {"Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "run", "()V"},
+    { "Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "checkPoint", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain5", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain4", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr008;", "nativeChain", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain3", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain2", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "chain1", "()V" },
+    { "Lnsk/jvmti/GetStackTrace/getstacktr008$TestThread;", "run", "()V" },
 };
 
 #define NUMBER_OF_STACK_FRAMES ((int) (sizeof(frames)/sizeof(frame_info)))
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -42,8 +42,8 @@
 } PropertyDesc;
 
 static PropertyDesc propDescList[PROPERTIES_COUNT] = {
-    {"nsk.jvmti.test.property", "value of nsk.jvmti.test.property", 0},
-    {"nsk.jvmti.test.property.empty", "", 0}
+    { "nsk.jvmti.test.property", "value of nsk.jvmti.test.property", 0 },
+    { "nsk.jvmti.test.property.empty", "", 0 }
 };
 
 /* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -41,8 +41,8 @@
 } PropertyDesc;
 
 static PropertyDesc propDescList[PROPERTIES_COUNT] = {
-    {"nsk.jvmti.test.property", "value of nsk.jvmti.test.property"},
-    {"nsk.jvmti.test.property.empty", ""}
+    { "nsk.jvmti.test.property", "value of nsk.jvmti.test.property" },
+    { "nsk.jvmti.test.property.empty", "" }
 };
 
 /* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadInfo/thrinfo001/thrinfo001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadInfo/thrinfo001/thrinfo001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -43,9 +43,9 @@
 static jint result = PASSED;
 static jvmtiThreadInfo inf;
 static info threads[] = {
-    {"main", JVMTI_THREAD_NORM_PRIORITY, 0},
-    {"thread1", JVMTI_THREAD_MIN_PRIORITY + 2, 1},
-    {"Thread-", JVMTI_THREAD_MIN_PRIORITY, 1}
+    { "main", JVMTI_THREAD_NORM_PRIORITY, 0 },
+    { "thread1", JVMTI_THREAD_MIN_PRIORITY + 2, 1 },
+    { "Thread-", JVMTI_THREAD_MIN_PRIORITY, 1 }
 };
 
 #ifdef STATIC_BUILD
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -46,19 +46,19 @@
 static jint result = PASSED;
 static jboolean printdump = JNI_FALSE;
 static method_info methods[] = {
-    {1, "meth_stat", "(ILjava/lang/String;)[F", JNI_TRUE, JNI_FALSE},
-    {1, "meth_1", "(CCC)C", JNI_FALSE, JNI_FALSE},
-    {1, "class$", "(Ljava/lang/String;)Ljava/lang/Class;", JNI_TRUE, JNI_TRUE},
-    {1, "access$000",
-        "(Lnsk/jvmti/IsMethodSynthetic/issynth001a;)I", JNI_TRUE, JNI_TRUE},
-    {1, "nmeth", "()V", JNI_FALSE, JNI_FALSE},
-    {1, "check", "(Ljava/lang/Class;Ljava/lang/Class;)I", JNI_TRUE, JNI_FALSE},
+    { 1, "meth_stat", "(ILjava/lang/String;)[F", JNI_TRUE, JNI_FALSE },
+    { 1, "meth_1", "(CCC)C", JNI_FALSE, JNI_FALSE },
+    { 1, "class$", "(Ljava/lang/String;)Ljava/lang/Class;", JNI_TRUE, JNI_TRUE },
+    { 1, "access$000",
+        "(Lnsk/jvmti/IsMethodSynthetic/issynth001a;)I", JNI_TRUE, JNI_TRUE },
+    { 1, "nmeth", "()V", JNI_FALSE, JNI_FALSE },
+    { 1, "check", "(Ljava/lang/Class;Ljava/lang/Class;)I", JNI_TRUE, JNI_FALSE },
 
-    {2, "<init>", "()V", JNI_FALSE, JNI_FALSE},
-    {2, "run",
-        "([Ljava/lang/String;Ljava/io/PrintStream;)I", JNI_TRUE, JNI_FALSE},
+    { 2, "<init>", "()V", JNI_FALSE, JNI_FALSE },
+    { 2, "run",
+        "([Ljava/lang/String;Ljava/io/PrintStream;)I", JNI_TRUE, JNI_FALSE },
 
-    {3, "meth_inn", "(Ljava/lang/String;J)V", JNI_FALSE, JNI_FALSE},
+    { 3, "meth_inn", "(Ljava/lang/String;J)V", JNI_FALSE, JNI_FALSE },
 };
 
 #ifdef STATIC_BUILD
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp	Thu Nov 29 17:45:29 2018 -0800
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp	Thu Nov 29 18:57:18 2018 -0800
@@ -75,14 +75,14 @@
 #define ARRAY_LENGTH 5
 
 static const wchar_t *STRING = L"I hope you'll find me in the heap!";
-static jboolean BOOLEAN_ARRAY[] = {JNI_TRUE, JNI_TRUE, JNI_FALSE, JNI_TRUE, JNI_FALSE};
-static jbyte BYTE_ARRAY[] = {BYTE, BYTE+1, BYTE+2, BYTE+3, BYTE+4};
-static jchar CHAR_ARRAY[] = {CHAR, CHAR+1, CHAR+2, CHAR+3, CHAR+4};
-static jshort SHORT_ARRAY[] = {SHORT, SHORT+1, SHORT+2, SHORT+3, SHORT+4};
-static jint INT_ARRAY[] = {INT, INT+1, INT+2, INT+3, INT+4};
-static jlong LONG_ARRAY[] = {LONG, LONG+1, LONG+2, LONG+3, LONG+4};
-static jfloat FLOAT_ARRAY[] = {FLOAT, FLOAT+1, FLOAT+2, FLOAT+3, FLOAT+4};
-static jdouble DOUBLE_ARRAY[] = {DOUBLE, DOUBLE+1, DOUBLE+2, DOUBLE+3, DOUBLE+4};
+static jboolean BOOLEAN_ARRAY[] = { JNI_TRUE, JNI_TRUE, JNI_FALSE, JNI_TRUE, JNI_FALSE };
+static jbyte BYTE_ARRAY[] = { BYTE, BYTE+1, BYTE+2, BYTE+3, BYTE+4 };
+static jchar CHAR_ARRAY[] = { CHAR, CHAR+1, CHAR+2, CHAR+3, CHAR+4 };
+static jshort SHORT_ARRAY[] = { SHORT, SHORT+1, SHORT+2, SHORT+3, SHORT+4 };
+static jint INT_ARRAY[] = { INT, INT+1, INT+2, INT+3, INT+4 };
+static jlong LONG_ARRAY[] = { LONG, LONG+1, LONG+2, LONG+3, LONG+4 };
+static jfloat FLOAT_ARRAY[] = { FLOAT, FLOAT+1, FLOAT+2, FLOAT+3, FLOAT+4 };
+static jdouble DOUBLE_ARRAY[] = { DOUBLE, DOUBLE+1, DOUBLE+2, DOUBLE+3, DOUBLE+4 };
 
 static long timeout = 0;