--- old/src/share/vm/prims/jvmtiRedefineClasses.cpp	2017-06-28 15:45:01.000000000 -0700
+++ new/src/share/vm/prims/jvmtiRedefineClasses.cpp	2017-06-28 15:45:01.000000000 -0700
@@ -241,16 +241,16 @@
   if (log_is_enabled(Info, redefine, class, timer)) {
     // Used to have separate timers for "doit" and "all", but the timer
     // overhead skewed the measurements.
-    jlong doit_time = _timer_rsc_phase1.milliseconds() +
-                      _timer_rsc_phase2.milliseconds();
-    jlong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
+    julong doit_time = _timer_rsc_phase1.milliseconds() +
+                       _timer_rsc_phase2.milliseconds();
+    julong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
 
     log_info(redefine, class, timer)
-      ("vm_op: all=" UINT64_FORMAT "  prologue=" UINT64_FORMAT "  doit=" UINT64_FORMAT,
-       all_time, _timer_vm_op_prologue.milliseconds(), doit_time);
+      ("vm_op: all=" JULONG_FORMAT "  prologue=" JULONG_FORMAT "  doit=" JULONG_FORMAT,
+       all_time, (julong)_timer_vm_op_prologue.milliseconds(), doit_time);
     log_info(redefine, class, timer)
-      ("redefine_single_class: phase1=" UINT64_FORMAT "  phase2=" UINT64_FORMAT,
-       _timer_rsc_phase1.milliseconds(), _timer_rsc_phase2.milliseconds());
+      ("redefine_single_class: phase1=" JULONG_FORMAT "  phase2=" JULONG_FORMAT,
+       (julong)_timer_rsc_phase1.milliseconds(), (julong)_timer_rsc_phase2.milliseconds());
   }
 }
 
@@ -1825,6 +1825,8 @@
           Bytes::put_Java_u2(p, new_index);
         }
       } break;
+      default:
+        break;
     }
   } // end for each bytecode