--- a/gcc/gimple-streamer-out.c	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/gimple-streamer-out.c	Thu Oct 25 07:37:49 2018 +0900
@@ -1,6 +1,6 @@
 /* Routines for emitting GIMPLE to a file stream.
 
-   Copyright (C) 2011-2017 Free Software Foundation, Inc.
+   Copyright (C) 2011-2018 Free Software Foundation, Inc.
    Contributed by Diego Novillo <dnovillo@google.com>
 
 This file is part of GCC.
@@ -31,6 +31,7 @@
 #include "gimple-iterator.h"
 #include "cgraph.h"
 #include "value-prof.h"
+#include "gimple-pretty-print.h"
 
 /* Output PHI function PHI to the main stream in OB.  */
 
@@ -210,8 +211,8 @@
 
   streamer_write_uhwi (ob, bb->index);
   bb->count.stream_out (ob);
-  streamer_write_hwi (ob, bb->frequency);
   streamer_write_hwi (ob, bb->flags);
+  streamer_write_hwi (ob, bb->discriminator);
 
   if (!gsi_end_p (bsi) || phi_nodes (bb))
     {
@@ -221,6 +222,11 @@
 	{
 	  int region;
 	  gimple *stmt = gsi_stmt (bsi);
+	  if (streamer_dump_file)
+	    {
+	      fprintf (streamer_dump_file, "  Streaming gimple stmt ");
+	      print_gimple_stmt (streamer_dump_file, stmt, 0, TDF_SLIM);
+	    }
 
 	  output_gimple_stmt (ob, stmt);