--- a/src/hotspot/share/opto/compile.cpp	Mon Jul 29 18:22:55 2019 +0200
+++ b/src/hotspot/share/opto/compile.cpp	Mon Jul 29 09:59:04 2019 -0700
@@ -2399,13 +2399,6 @@
   }
 
 #ifdef ASSERT
-  bs->verify_gc_barriers(this, BarrierSetC2::BeforeLateInsertion);
-#endif
-
-  bs->barrier_insertion_phase(C, igvn);
-  if (failing())  return;
-
-#ifdef ASSERT
   bs->verify_gc_barriers(this, BarrierSetC2::BeforeMacroExpand);
 #endif
 
@@ -2419,6 +2412,13 @@
     print_method(PHASE_MACRO_EXPANSION, 2);
   }
 
+#ifdef ASSERT
+  bs->verify_gc_barriers(this, BarrierSetC2::BeforeLateInsertion);
+#endif
+
+  bs->barrier_insertion_phase(C, igvn);
+  if (failing())  return;
+
   {
     TracePhase tp("barrierExpand", &timers[_t_barrierExpand]);
     if (bs->expand_barriers(this, igvn)) {