--- old/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp	2018-03-15 09:34:57.361943453 +0100
+++ new/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp	2018-03-15 09:34:57.184935828 +0100
@@ -1417,6 +1417,7 @@
   void fold_8bit_crc32(Register crc, Register table, Register tmp);
   // CRC32C code for java.util.zip.CRC32C::updateBytes/updateDirectByteBuffer intrinsic.
   void kernel_crc32c(Register crc, Register buf, Register len, Register table);
+
 };
 
 /**
--- old/src/hotspot/cpu/x86/assembler_x86.cpp	2018-03-15 09:34:57.669956721 +0100
+++ new/src/hotspot/cpu/x86/assembler_x86.cpp	2018-03-15 09:34:57.485948794 +0100
@@ -8946,7 +8946,7 @@
   emit_arith(0x85, 0xC0, dst, src);
 }
 
-void Assembler::testq(Register dst, Address  src) {
+void Assembler::testq(Register dst, Address src) {
   InstructionMark im(this);
   prefixq(src, dst);
   emit_int8((unsigned char)0x85);
--- old/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2018-03-15 09:34:58.059973521 +0100
+++ new/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2018-03-15 09:34:57.876965638 +0100
@@ -50,7 +50,6 @@
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/heapRegion.hpp"
-#include "gc/z/zGlobals.hpp"
 #endif // INCLUDE_ALL_GCS
 #include "crc32c.h"
 #ifdef COMPILER2
--- old/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp	2018-03-15 09:34:58.484991829 +0100
+++ new/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp	2018-03-15 09:34:58.295983687 +0100
@@ -36,7 +36,6 @@
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/compiledICHolder.hpp"
-#include "oops/oop.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframeArray.hpp"
 #include "utilities/align.hpp"
--- old/src/hotspot/cpu/x86/stubRoutines_x86.hpp	2018-03-15 09:34:58.841007165 +0100
+++ new/src/hotspot/cpu/x86/stubRoutines_x86.hpp	2018-03-15 09:34:58.657999281 +0100
@@ -59,11 +59,9 @@
   static address _load_barrier_weak_slow_stub[];
 
  public:
-
   static address load_barrier_slow_stub(Register reg) { return _load_barrier_slow_stub[reg->encoding()]; }
   static address load_barrier_weak_slow_stub(Register reg) { return _load_barrier_weak_slow_stub[reg->encoding()]; }
 
-
   static address get_previous_fp_entry() {
     return _get_previous_fp_entry;
   }
--- old/src/hotspot/cpu/x86/x86.ad	2018-03-15 09:34:59.143020174 +0100
+++ new/src/hotspot/cpu/x86/x86.ad	2018-03-15 09:34:58.954012032 +0100
@@ -1197,7 +1197,6 @@
 reg_class ymm31_reg(XMM31, XMM31b, XMM31c, XMM31d, XMM31e, XMM31f, XMM31g, XMM31h);
 reg_class zmm31_reg(XMM31, XMM31b, XMM31c, XMM31d, XMM31e, XMM31f, XMM31g, XMM31h, XMM31i, XMM31j, XMM31k, XMM31l, XMM31m, XMM31n, XMM31o, XMM31p);
 
-
 #endif
 
 %}
--- old/src/hotspot/share/opto/connode.hpp	2018-03-15 09:34:59.599039817 +0100
+++ new/src/hotspot/share/opto/connode.hpp	2018-03-15 09:34:59.410031676 +0100
@@ -158,5 +158,4 @@
 };
 
 
-
 #endif // SHARE_VM_OPTO_CONNODE_HPP
--- old/src/hotspot/share/opto/loopopts.cpp	2018-03-15 09:34:59.919053602 +0100
+++ new/src/hotspot/share/opto/loopopts.cpp	2018-03-15 09:34:59.728045374 +0100
@@ -882,7 +882,6 @@
 Node *PhaseIdealLoop::split_if_with_blocks_pre( Node *n ) {
   // Cloning these guys is unlikely to win
   int n_op = n->Opcode();
-
   if( n_op == Op_MergeMem ) return n;
   if( n->is_Proj() ) return n;
   // Do not clone-up CmpFXXX variations, as these are always
@@ -893,10 +892,8 @@
     Node *cmov = conditional_move( n );
     if( cmov ) return cmov;
   }
-
-  if (n->is_CFG() || n->is_LoadStore()) {
+  if( n->is_CFG() || n->is_LoadStore() )
     return n;
-  }
   if( n_op == Op_Opaque1 ||     // Opaque nodes cannot be mod'd
       n_op == Op_Opaque2 ) {
     if( !C->major_progress() )   // If chance of no more loop opts...
@@ -1555,7 +1552,6 @@
       n_op == Op_RangeCheck) {
     Node *bol = n->in(1);
     uint max = bol->outcnt();
-
     // Check for same test used more than once?
     if (max > 1 && bol->is_Bool()) {
       // Search up IDOMs to see if this IF is dominated.
--- old/src/hotspot/share/opto/node.cpp	2018-03-15 09:35:00.282069239 +0100
+++ new/src/hotspot/share/opto/node.cpp	2018-03-15 09:35:00.092061055 +0100
@@ -79,7 +79,6 @@
   if (BreakAtNode != 0 && (_debug_idx == BreakAtNode || (int)_idx == BreakAtNode)) {
     tty->print_cr("BreakAtNode: _idx=%d _debug_idx=%d", _idx, _debug_idx);
     BREAKPOINT;
-    os::message_box("xxx", "yyy");
   }
 #if OPTO_DU_ITERATOR_ASSERT
   _last_del = NULL;