summaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog15
-rw-r--r--gcc/cp/class.c1
-rw-r--r--gcc/cp/cp-gimplify.c2
-rw-r--r--gcc/cp/decl2.c1
-rw-r--r--gcc/cp/error.c1
-rw-r--r--gcc/cp/except.c1
-rw-r--r--gcc/cp/init.c1
-rw-r--r--gcc/cp/method.c2
-rw-r--r--gcc/cp/optimize.c2
-rw-r--r--gcc/cp/pt.c1
-rw-r--r--gcc/cp/semantics.c2
-rw-r--r--gcc/cp/tree.c2
-rw-r--r--gcc/cp/vtable-class-hierarchy.c2
13 files changed, 25 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c85345eb270..7c6b2319e35 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,18 @@
+2013-11-12 Andrew MacLeod <amacleod@redhat.com>
+
+ * cp/class.c: Include gimplify.h.
+ * cp/cp-gimplify.c: Likewise.
+ * cp/error.c: Likewise.
+ * cp/init.c: Likewise.
+ * cp/optimize.c: Likewise.
+ * cp/pt.c: Likewise.
+ * cp/semantics.c: Likewise.
+ * cp/tree.c: Likewise.
+ * cp/vtable-class-hierarchy.c: Likewise.
+ * cp/decl2.c: Don't include gimple.h.
+ * cp/except.c: Likewise.
+ * cp/method.c: Include pointer-set.h instead of gimple.h.
+
2013-11-12 Adam Butcher <adam@jessamine.co.uk>
* pt.c (convert_generic_types_to_packs): New function to transform
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 64681ba44df..b4cab542e2e 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. If not see
#include "splay-tree.h"
#include "pointer-set.h"
#include "hash-table.h"
+#include "gimplify.h"
/* The number of nested classes being processed. If we are not in the
scope of any class, this is zero. */
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 53b0ca8f928..e8ccf1aa561 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -27,7 +27,7 @@ along with GCC; see the file COPYING3. If not see
#include "cp-tree.h"
#include "c-family/c-common.h"
#include "tree-iterator.h"
-#include "gimple.h"
+#include "gimplify.h"
#include "hashtab.h"
#include "pointer-set.h"
#include "flags.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index a094ff3b546..18456848492 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -45,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-pragma.h"
#include "dumpfile.h"
#include "intl.h"
-#include "gimple.h"
#include "pointer-set.h"
#include "splay-tree.h"
#include "langhooks.h"
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 5f997c3ed29..3d72c1340dc 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -33,6 +33,7 @@ along with GCC; see the file COPYING3. If not see
#include "pointer-set.h"
#include "c-family/c-objc.h"
#include "ubsan.h"
+#include "gimplify.h"
#include <new> // For placement-new.
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index daac0fde7e6..ac2128d13b0 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "tree-iterator.h"
#include "target.h"
-#include "gimple.h"
static void push_eh_cleanup (tree);
static tree prepare_eh_type (tree);
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index a4d8280dfd8..1919603a705 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3. If not see
#include "cp-tree.h"
#include "flags.h"
#include "target.h"
+#include "gimplify.h"
static bool begin_init_stmts (tree *, tree *);
static tree finish_init_stmts (bool, tree, tree);
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 353e99a6410..272ef42217f 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -34,7 +34,7 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "diagnostic.h"
#include "cgraph.h"
-#include "gimple.h"
+#include "pointer-set.h"
/* Various flags to control the mangling process. */
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index c4ee8484bb9..736dad9bec7 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -34,7 +34,7 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
-#include "gimple.h"
+#include "gimplify.h"
#include "tree-iterator.h"
#include "cgraph.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 57a9769aecc..96a7db58e23 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -42,6 +42,7 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "tree-iterator.h"
#include "type-utils.h"
+#include "gimplify.h"
/* The type of functions taking a tree, and some additional data, and
returning an int. */
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 366756fd437..202f1cf6854 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -41,7 +41,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "vec.h"
#include "target.h"
-#include "gimple.h"
+#include "gimplify.h"
#include "bitmap.h"
#include "hash-table.h"
#include "omp-low.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 3ac03480620..eb7bd876817 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -30,7 +30,7 @@ along with GCC; see the file COPYING3. If not see
#include "convert.h"
#include "cgraph.h"
#include "splay-tree.h"
-#include "gimple.h" /* gimple_has_body_p */
+#include "gimplify.h"
#include "hash-table.h"
static tree bot_manip (tree *, int *, void *);
diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c
index 78611a83264..39c75ce5c33 100644
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -118,7 +118,7 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "tree-iterator.h"
#include "vtable-verify.h"
-#include "gimple.h"
+#include "gimplify.h"
static int num_calls_to_regset = 0;
static int num_calls_to_regpair = 0;