Fix PR c++/42260 and ensure PR c++/45383 is fixed

[pf3gnuchains/gcc-fork.git] / gcc / tree-phinodes.c

diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c
index d9b82e3..7fb85d4 100644 (file)
--- a/gcc/tree-phinodes.c
+++ b/gcc/tree-phinodes.c
@@ -22,10 +22,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "rtl.h"
+#include "rtl.h"       /* FIXME: Only for ceil_log2, of all things...  */
 #include "ggc.h"
 #include "basic-block.h"
 #include "tree-flow.h"
+#include "diagnostic-core.h"
 #include "toplev.h"
 #include "gimple.h"
 
@@ -153,7 +154,7 @@ allocate_phi_node (size_t len)
     }
   else
     {
-      phi = (gimple) ggc_alloc (size);
+      phi = ggc_alloc_gimple_statement_d (size);
 #ifdef GATHER_STATISTICS
       phi_nodes_created++;
        {