--- a/src/hotspot/cpu/sparc/assembler_sparc.hpp	Wed May 30 14:46:28 2018 +0200
+++ b/src/hotspot/cpu/sparc/assembler_sparc.hpp	Wed May 30 16:10:21 2018 +0200
@@ -783,8 +783,10 @@
   void flush() {
 #ifdef VALIDATE_PIPELINE
     assert(_delay_state == NoDelay, "Ending code with a delay-slot.");
+#ifdef COMPILER2
     validate_no_pipeline_hazards();
 #endif
+#endif
     AbstractAssembler::flush();
   }