diff -r a57d206ac60f src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp	Tue May 03 12:23:06 2016 +0200
+++ b/src/os/linux/vm/os_linux.cpp	Mon May 09 10:16:29 2016 +0200
@@ -6034,8 +6034,8 @@
 
     if (core_pattern[0] == '|') {
       written = jio_snprintf(buffer, bufferSize,
-                        "\"%s\" (or dumping to %s/core.%d)",
-                                     &core_pattern[1], p, current_process_id());
+                             "\"%s\" (or dumping to %s/core.%d)",
+                             &core_pattern[1], p, current_process_id());
     } else {
       written = jio_snprintf(buffer, bufferSize, "%s/%s", p, core_pattern);
     }
@@ -6068,20 +6068,20 @@
   char *p = &buf[len];
 
   jio_snprintf(p, buflen-len,
-             "\n\n"
-             "Do you want to debug the problem?\n\n"
-             "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " UINTX_FORMAT " (" INTPTR_FORMAT ")\n"
-             "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n"
-             "Otherwise, press RETURN to abort...",
-             os::current_process_id(), os::current_process_id(),
-             os::current_thread_id(), os::current_thread_id());
+               "\n\n"
+               "Do you want to debug the problem?\n\n"
+               "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " UINTX_FORMAT " (" INTPTR_FORMAT ")\n"
+               "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n"
+               "Otherwise, press RETURN to abort...",
+               os::current_process_id(), os::current_process_id(),
+               os::current_thread_id(), os::current_thread_id());
 
   bool yes = os::message_box("Unexpected Error", buf);
 
   if (yes) {
     // yes, user asked VM to launch debugger
     jio_snprintf(buf, sizeof(char)*buflen, "gdb /proc/%d/exe %d",
-                     os::current_process_id(), os::current_process_id());
+                 os::current_process_id(), os::current_process_id());
 
     os::fork_and_exec(buf);
     yes = false;
diff -r a57d206ac60f src/share/vm/classfile/classLoader.cpp
--- a/src/share/vm/classfile/classLoader.cpp	Tue May 03 12:23:06 2016 +0200
+++ b/src/share/vm/classfile/classLoader.cpp	Mon May 09 10:16:29 2016 +0200
@@ -305,7 +305,6 @@
     }
 
     if (is_multi_ver) {
-      int n;
       char entry_name[JVM_MAXPATHLEN];
       if (version > 0) {
         jio_snprintf(entry_name, sizeof(entry_name), "META-INF/versions/%d/%s", version, name);
diff -r a57d206ac60f src/share/vm/logging/logTagSet.cpp
--- a/src/share/vm/logging/logTagSet.cpp	Tue May 03 12:23:06 2016 +0200
+++ b/src/share/vm/logging/logTagSet.cpp	Mon May 09 10:16:29 2016 +0200
@@ -108,6 +108,7 @@
   if (prefix_len < vwrite_buffer_size) {
     ret = os::log_vsnprintf(buf + prefix_len, sizeof(buf) - prefix_len, fmt, args);
   } else {
+    // Buffer too small. Just call printf to find out the length for realloc below.
     ret = prefix_len + os::log_vsnprintf(buf, sizeof(buf), fmt, args);
   }
   assert(ret >= 0, "Log message buffer issue");
diff -r a57d206ac60f src/share/vm/oops/generateOopMap.cpp
--- a/src/share/vm/oops/generateOopMap.cpp	Tue May 03 12:23:06 2016 +0200
+++ b/src/share/vm/oops/generateOopMap.cpp	Mon May 09 10:16:29 2016 +0200
@@ -1678,10 +1678,14 @@
   CellTypeState actual[5];
   assert(poplen < 5, "this must be less than length of actual vector");
 
-  // pop all arguments
-  for (int i = 0; i < poplen; i++) { actual[i] = pop(); }
+  // Pop all arguments.
+  for (int i = 0; i < poplen; i++) {
+    actual[i] = pop();
+  }
   // Field _state is uninitialized when calling push.
-  for (int i = poplen; i < 5; i++) { actual[i] = CellTypeState::uninit; }
+  for (int i = poplen; i < 5; i++) {
+    actual[i] = CellTypeState::uninit;
+  }
 
   // put them back
   char push_ch = *out++;