summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-07 20:52:50 +0000
committertbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-07 20:52:50 +0000
commit7149db5f6db41c31e94dc3fc4044a4dea943df50 (patch)
tree2f04d8ba00f9eb6f8c4049c37c92a052fba7d137
parent28b3c9274184802d59d9918e9327df21defa49fb (diff)
downloadgcc-7149db5f6db41c31e94dc3fc4044a4dea943df50.tar.gz
remove pointer-set.[ch]
gcc/ * Makefile.in: Remove references to pointer-set.c and pointer-set.h. * alias.c, cfgexpand.c, cgraphbuild.c, config/aarch64/aarch64-builtins.c, config/aarch64/aarch64.c, config/alpha/alpha.c, config/darwin.c, config/i386/i386.c, config/i386/winnt.c, config/ia64/ia64.c, config/m32c/m32c.c, config/mep/mep.c, config/mips/mips.c, config/rs6000/rs6000.c, config/s390/s390.c, config/sh/sh.c, config/sparc/sparc.c, config/spu/spu.c, config/stormy16/stormy16.c, config/tilegx/tilegx.c, config/tilepro/tilepro.c, config/xtensa/xtensa.c, dominance.c, dse.c, except.c, gengtype.c, gimple-expr.c, gimple-ssa-strength-reduction.c, gimplify.c, ifcvt.c, ipa-visibility.c, lto-streamer.h, omp-low.c, predict.c, stmt.c, tree-affine.c, tree-cfg.c, tree-eh.c, tree-inline.c, tree-nested.c, tree-scalar-evolution.c, tree-ssa-loop-im.c, tree-ssa-loop-niter.c, tree-ssa-phiopt.c, tree-ssa-structalias.c, tree-ssa-uninit.c, tree-ssa.c, tree.c, var-tracking.c, varpool.c: Remove includes of pointer-set.h. * pointer-set.c: Remove file. * pointer-set.h: Remove file. gcc/c-family/ * c-gimplify.c, cilk.c: Remove includes of pointer-set.h. gcc/c/ * c-typeck.c: Remove include of pointer-set.h. gcc/cp/ * class.c, cp-gimplify.c, decl.c, decl2.c, error.c, method.c, optimize.c, pt.c, semantics.c: Remove includes of pointer-set.h. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213738 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog22
-rw-r--r--gcc/Makefile.in7
-rw-r--r--gcc/alias.c1
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c-gimplify.c1
-rw-r--r--gcc/c-family/cilk.c1
-rw-r--r--gcc/c/ChangeLog4
-rw-r--r--gcc/c/c-typeck.c1
-rw-r--r--gcc/cfgexpand.c1
-rw-r--r--gcc/cgraphbuild.c1
-rw-r--r--gcc/config/aarch64/aarch64-builtins.c1
-rw-r--r--gcc/config/aarch64/aarch64.c1
-rw-r--r--gcc/config/alpha/alpha.c1
-rw-r--r--gcc/config/darwin.c1
-rw-r--r--gcc/config/i386/i386.c1
-rw-r--r--gcc/config/i386/winnt.c1
-rw-r--r--gcc/config/ia64/ia64.c1
-rw-r--r--gcc/config/m32c/m32c.c1
-rw-r--r--gcc/config/mep/mep.c1
-rw-r--r--gcc/config/mips/mips.c1
-rw-r--r--gcc/config/rs6000/rs6000.c1
-rw-r--r--gcc/config/s390/s390.c1
-rw-r--r--gcc/config/sh/sh.c1
-rw-r--r--gcc/config/sparc/sparc.c1
-rw-r--r--gcc/config/spu/spu.c1
-rw-r--r--gcc/config/stormy16/stormy16.c1
-rw-r--r--gcc/config/tilegx/tilegx.c1
-rw-r--r--gcc/config/tilepro/tilepro.c1
-rw-r--r--gcc/config/xtensa/xtensa.c1
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/class.c1
-rw-r--r--gcc/cp/cp-gimplify.c1
-rw-r--r--gcc/cp/decl.c1
-rw-r--r--gcc/cp/decl2.c1
-rw-r--r--gcc/cp/error.c1
-rw-r--r--gcc/cp/method.c1
-rw-r--r--gcc/cp/optimize.c1
-rw-r--r--gcc/cp/pt.c1
-rw-r--r--gcc/cp/semantics.c1
-rw-r--r--gcc/dominance.c1
-rw-r--r--gcc/dse.c1
-rw-r--r--gcc/except.c1
-rw-r--r--gcc/gengtype.c2
-rw-r--r--gcc/gimple-expr.c1
-rw-r--r--gcc/gimple-ssa-strength-reduction.c1
-rw-r--r--gcc/gimplify.c1
-rw-r--r--gcc/ifcvt.c1
-rw-r--r--gcc/ipa-visibility.c1
-rw-r--r--gcc/lto-streamer.h1
-rw-r--r--gcc/omp-low.c1
-rw-r--r--gcc/pointer-set.c271
-rw-r--r--gcc/pointer-set.h59
-rw-r--r--gcc/predict.c1
-rw-r--r--gcc/stmt.c1
-rw-r--r--gcc/testsuite/g++.dg/plugin/selfassign.c1
-rw-r--r--gcc/testsuite/gcc.dg/plugin/finish_unit_plugin.c1
-rw-r--r--gcc/testsuite/gcc.dg/plugin/ggcplug.c1
-rw-r--r--gcc/testsuite/gcc.dg/plugin/one_time_plugin.c1
-rw-r--r--gcc/testsuite/gcc.dg/plugin/selfassign.c1
-rw-r--r--gcc/testsuite/gcc.dg/plugin/start_unit_plugin.c1
-rw-r--r--gcc/tree-affine.c1
-rw-r--r--gcc/tree-cfg.c1
-rw-r--r--gcc/tree-eh.c1
-rw-r--r--gcc/tree-inline.c1
-rw-r--r--gcc/tree-nested.c1
-rw-r--r--gcc/tree-scalar-evolution.c1
-rw-r--r--gcc/tree-ssa-loop-im.c1
-rw-r--r--gcc/tree-ssa-loop-niter.c1
-rw-r--r--gcc/tree-ssa-phiopt.c1
-rw-r--r--gcc/tree-ssa-structalias.c1
-rw-r--r--gcc/tree-ssa-uninit.c1
-rw-r--r--gcc/tree-ssa.c1
-rw-r--r--gcc/tree.c1
-rw-r--r--gcc/var-tracking.c1
-rw-r--r--gcc/varpool.c1
75 files changed, 39 insertions, 402 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0bfed4ec780..8eba08d457f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,25 @@
+2014-08-07 Trevor Saunders <tsaunders@mozilla.com>
+
+ * Makefile.in: Remove references to pointer-set.c and pointer-set.h.
+ * alias.c, cfgexpand.c, cgraphbuild.c,
+ config/aarch64/aarch64-builtins.c, config/aarch64/aarch64.c,
+ config/alpha/alpha.c, config/darwin.c, config/i386/i386.c,
+ config/i386/winnt.c, config/ia64/ia64.c, config/m32c/m32c.c,
+ config/mep/mep.c, config/mips/mips.c, config/rs6000/rs6000.c,
+ config/s390/s390.c, config/sh/sh.c, config/sparc/sparc.c,
+ config/spu/spu.c, config/stormy16/stormy16.c, config/tilegx/tilegx.c,
+ config/tilepro/tilepro.c, config/xtensa/xtensa.c, dominance.c,
+ dse.c, except.c, gengtype.c, gimple-expr.c,
+ gimple-ssa-strength-reduction.c, gimplify.c, ifcvt.c,
+ ipa-visibility.c, lto-streamer.h, omp-low.c, predict.c, stmt.c,
+ tree-affine.c, tree-cfg.c, tree-eh.c, tree-inline.c, tree-nested.c,
+ tree-scalar-evolution.c, tree-ssa-loop-im.c, tree-ssa-loop-niter.c,
+ tree-ssa-phiopt.c, tree-ssa-structalias.c, tree-ssa-uninit.c,
+ tree-ssa.c, tree.c, var-tracking.c, varpool.c: Remove includes of
+ pointer-set.h.
+ * pointer-set.c: Remove file.
+ * pointer-set.h: Remove file.
+
2014-08-07 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* config/arm/arm.md (*cmov<mode>): Set type attribute to fcsel.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index a2fb5f5b47f..31c1f4d59b4 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -892,7 +892,7 @@ TREE_H = tree.h $(TREE_CORE_H) tree-check.h
REGSET_H = regset.h $(BITMAP_H) hard-reg-set.h
BASIC_BLOCK_H = basic-block.h $(PREDICT_H) $(VEC_H) $(FUNCTION_H) \
cfg-flags.def cfghooks.h
-GIMPLE_H = gimple.h gimple.def gsstruct.def pointer-set.h $(VEC_H) \
+GIMPLE_H = gimple.h gimple.def gsstruct.def $(VEC_H) \
$(GGC_H) $(BASIC_BLOCK_H) $(TREE_H) tree-ssa-operands.h \
tree-ssa-alias.h $(INTERNAL_FN_H) $(HASH_TABLE_H) is-a.h
GCOV_IO_H = gcov-io.h gcov-iov.h auto-host.h gcov-counter.def
@@ -950,7 +950,7 @@ TREE_INLINE_H = tree-inline.h
REAL_H = real.h $(MACHMODE_H)
LTO_STREAMER_H = lto-streamer.h $(LINKER_PLUGIN_API_H) $(TARGET_H) \
$(CGRAPH_H) $(VEC_H) $(HASH_TABLE_H) $(TREE_H) $(GIMPLE_H) \
- $(GCOV_IO_H) $(DIAGNOSTIC_H) alloc-pool.h pointer-set.h
+ $(GCOV_IO_H) $(DIAGNOSTIC_H) alloc-pool.h
IPA_PROP_H = ipa-prop.h $(TREE_H) $(VEC_H) $(CGRAPH_H) $(GIMPLE_H) alloc-pool.h
BITMAP_H = bitmap.h $(HASHTAB_H) statistics.h
GCC_PLUGIN_H = gcc-plugin.h highlev-plugin-common.h plugin.def \
@@ -1329,7 +1329,6 @@ OBJS = \
opts-global.o \
passes.o \
plugin.o \
- pointer-set.o \
postreload-gcse.o \
postreload.o \
predict.o \
@@ -3140,7 +3139,7 @@ installdirs:
$(mkinstalldirs) $(DESTDIR)$(man7dir)
PLUGIN_HEADERS = $(TREE_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
- toplev.h $(DIAGNOSTIC_CORE_H) $(BASIC_BLOCK_H) pointer-set.h $(HASH_TABLE_H) \
+ toplev.h $(DIAGNOSTIC_CORE_H) $(BASIC_BLOCK_H) $(HASH_TABLE_H) \
tree-ssa-alias.h $(INTERNAL_FN_H) gimple-fold.h tree-eh.h gimple-expr.h \
gimple.h is-a.h $(TREE_PASS_H) $(GCC_PLUGIN_H) \
$(GGC_H) $(TREE_DUMP_H) $(PRETTY_PRINT_H) $(OPTS_H) $(PARAMS_H) \
diff --git a/gcc/alias.c b/gcc/alias.c
index d8e10dbde85..39df09b4e88 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -42,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "df.h"
#include "tree-ssa-alias.h"
-#include "pointer-set.h"
#include "internal-fn.h"
#include "gimple-expr.h"
#include "is-a.h"
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index b599627c397..803eb7b4019 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07 Trevor Saunders <tsaunders@mozilla.com>
+
+ * c-gimplify.c, cilk.c: Remove includes of pointer-set.h.
+
2014-08-03 Marek Polacek <polacek@redhat.com>
* c-common.c (check_case_value): Add location_t parameter. Use it.
diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index 489821757ed..8f7cf42a091 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -46,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "cilk.h"
#include "c-ubsan.h"
-#include "pointer-set.h"
/* The gimplification pass converts the language-dependent trees
(ld-trees) emitted by the parser into language-independent trees
diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index e0d114128ab..20b343214d4 100644
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "calls.h"
#include "langhooks.h"
-#include "pointer-set.h"
#include "gimple-expr.h"
#include "gimplify.h"
#include "tree-iterator.h"
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 484a284b0fd..3dcd81f9c45 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07 Trevor Saunders <tsaunders@mozilla.com>
+
+ * c-typeck.c: Remove include of pointer-set.h.
+
2014-08-07 Marek Polacek <polacek@redhat.com>
* c-typeck.c (pointer_diff): Remove P - (P + CST) optimization.
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 998e3863a96..f8a231617ae 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "tree-iterator.h"
#include "bitmap.h"
-#include "pointer-set.h"
#include "basic-block.h"
#include "gimple-expr.h"
#include "gimplify.h"
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 5ac22a21765..ea53d2a3bdf 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "bitmap.h"
#include "hash-set.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index a04958f4d8c..b10061bc8f4 100644
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "pointer-set.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c
index ba58a99174a..5217f4a5f39 100644
--- a/gcc/config/aarch64/aarch64-builtins.c
+++ b/gcc/config/aarch64/aarch64-builtins.c
@@ -33,7 +33,6 @@
#include "langhooks.h"
#include "diagnostic-core.h"
#include "optabs.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 832bcf36c63..e7946fc0b70 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -46,7 +46,6 @@
#include "recog.h"
#include "langhooks.h"
#include "diagnostic-core.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index e79621ff058..59bcdd43567 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -51,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "langhooks.h"
#include "splay-tree.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index d13983ce811..60c8d1ef37c 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "df.h"
#include "debug.h"
#include "obstack.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 929f1b14a86..6b43fd43d73 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -52,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "reload.h"
#include "cgraph.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index bf6e2b1fec2..a9ca2fd2aca 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -37,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "target.h"
#include "except.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index c2e807c314d..cb840fd8a9b 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -53,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hash-table.h"
#include "langhooks.h"
-#include "pointer-set.h"
#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index 69b9c55e534..23fd1cc5935 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -48,7 +48,6 @@
#include "target-def.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index 853821c8771..dadd92bab21 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -51,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "target-def.h"
#include "langhooks.h"
#include "df.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index d8654c4479a..d2c9b4c78a2 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -54,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "langhooks.h"
#include "sched-int.h"
-#include "pointer-set.h"
#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index d088ff6acd2..4b19a666eaa 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -56,7 +56,6 @@
#include "reload.h"
#include "cfgloop.h"
#include "sched-int.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 03b85ff2ee1..a2617a86e64 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -52,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "langhooks.h"
#include "optabs.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index a19235d2411..c74200f6bae 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -56,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "sched-int.h"
#include "params.h"
#include "ggc.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 2a2eabdeed5..595939d5a8e 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -50,7 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "target-def.h"
#include "common/common-target.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "basic-block.h"
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index a32a3a33bdf..60d537ff64d 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -49,7 +49,6 @@
#include "sched-int.h"
#include "params.h"
#include "machmode.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index 1463d52ef01..df207c03e7c 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -47,7 +47,6 @@
#include "target-def.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/config/tilegx/tilegx.c b/gcc/config/tilegx/tilegx.c
index ab53fab26b8..69c9be4f9b6 100644
--- a/gcc/config/tilegx/tilegx.c
+++ b/gcc/config/tilegx/tilegx.c
@@ -40,7 +40,6 @@
#include "dwarf2.h"
#include "timevar.h"
#include "tree.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/config/tilepro/tilepro.c b/gcc/config/tilepro/tilepro.c
index 1749556a557..d36c0659969 100644
--- a/gcc/config/tilepro/tilepro.c
+++ b/gcc/config/tilepro/tilepro.c
@@ -41,7 +41,6 @@
#include "dwarf2.h"
#include "timevar.h"
#include "tree.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index 540ffecd391..173b27b9588 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -50,7 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "target-def.h"
#include "langhooks.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0e70c5f7129..23afac42f14 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-07 Trevor Saunders <tsaunders@mozilla.com>
+
+ * class.c, cp-gimplify.c, decl.c, decl2.c, error.c, method.c,
+ optimize.c, pt.c, semantics.c: Remove includes of pointer-set.h.
+
2014-08-07 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51312
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 811b581cd5a..7f6952ae908 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "stor-layout.h"
#include "attribs.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "cp-tree.h"
#include "flags.h"
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 55d6c144dd6..e2bf5470799 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -28,7 +28,6 @@ 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 "pointer-set.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index bb6135b631f..79e73624973 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -55,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "debug.h"
#include "timevar.h"
-#include "pointer-set.h"
#include "splay-tree.h"
#include "plugin.h"
#include "cgraph.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 9375f3fa98f..1740a2e7340 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "attribs.h"
#include "stor-layout.h"
#include "calls.h"
-#include "pointer-set.h"
#include "flags.h"
#include "cp-tree.h"
#include "decl.h"
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index c8987ee1d04..2ce6490681b 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "cxx-pretty-print.h"
#include "tree-pretty-print.h"
-#include "pointer-set.h"
#include "c-family/c-objc.h"
#include "ubsan.h"
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 56f50e1e5da..d0e010500f8 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "diagnostic.h"
#include "cgraph.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 6eeca4d64f9..f9a236e8427 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
-#include "pointer-set.h"
#include "tree-iterator.h"
#include "cgraph.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 5fa33b906c7..30d8950e204 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "attribs.h"
#include "stor-layout.h"
#include "intl.h"
-#include "pointer-set.h"
#include "flags.h"
#include "cp-tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 4cd9bee353f..14bf82d6f0a 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -44,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "tree-iterator.h"
#include "target.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "gimplify.h"
#include "bitmap.h"
diff --git a/gcc/dominance.c b/gcc/dominance.c
index be0a43910e6..c8b47a3cf3e 100644
--- a/gcc/dominance.c
+++ b/gcc/dominance.c
@@ -44,7 +44,6 @@
#include "et-forest.h"
#include "timevar.h"
#include "hash-map.h"
-#include "pointer-set.h"
#include "graphds.h"
#include "bitmap.h"
diff --git a/gcc/dse.c b/gcc/dse.c
index 6370c97b9de..8c3d84143e4 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -47,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "dbgcnt.h"
#include "target.h"
#include "params.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/except.c b/gcc/except.c
index ec08e912197..58ee4bb505d 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -139,7 +139,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-pass.h"
-#include "pointer-set.h"
#include "cfgloop.h"
#include "builtins.h"
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index e66941b9602..c1f9e693c22 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -1825,7 +1825,7 @@ open_base_files (void)
"tree.h", "rtl.h", "wide-int.h", "function.h", "insn-config.h", "expr.h",
"hard-reg-set.h", "basic-block.h", "cselib.h", "insn-addr.h",
"optabs.h", "libfuncs.h", "debug.h", "ggc.h", "cgraph.h",
- "pointer-set.h", "hash-table.h", "vec.h", "ggc.h", "basic-block.h",
+ "hash-table.h", "vec.h", "ggc.h", "basic-block.h",
"tree-ssa-alias.h", "internal-fn.h", "gimple-fold.h", "tree-eh.h",
"gimple-expr.h", "is-a.h",
"gimple.h", "gimple-iterator.h", "gimple-ssa.h", "tree-cfg.h",
diff --git a/gcc/gimple-expr.c b/gcc/gimple-expr.c
index 73285b282a7..0e8a01ac877 100644
--- a/gcc/gimple-expr.c
+++ b/gcc/gimple-expr.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "pointer-set.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c
index a9e01613150..6bf54d64605 100644
--- a/gcc/gimple-ssa-strength-reduction.c
+++ b/gcc/gimple-ssa-strength-reduction.c
@@ -37,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "pointer-set.h"
#include "hash-map.h"
#include "hash-table.h"
#include "basic-block.h"
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index c0ae7cc7851..279158d4d4a 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "expr.h"
#include "hash-set.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index e9f56c12d1d..754a707cd35 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -41,7 +41,6 @@
#include "tree-pass.h"
#include "df.h"
#include "vec.h"
-#include "pointer-set.h"
#include "dbgcnt.h"
#ifndef HAVE_conditional_move
diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c
index bca2bc7a0cf..110d22b43c0 100644
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@@ -79,7 +79,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "cgraph.h"
#include "tree-pass.h"
-#include "pointer-set.h"
#include "calls.h"
#include "gimple-expr.h"
#include "varasm.h"
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index f304ba2098f..9f89a6c7ed6 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "alloc-pool.h"
#include "gcov-io.h"
#include "diagnostic.h"
-#include "pointer-set.h"
/* Define when debugging the LTO streamer. This causes the writer
to output the numeric value for the memory address of the tree node
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 0fe2a402d55..7f268650e10 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "stor-layout.h"
#include "rtl.h"
-#include "pointer-set.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/pointer-set.c b/gcc/pointer-set.c
deleted file mode 100644
index 8b6a73257d6..00000000000
--- a/gcc/pointer-set.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Set operations on pointers
- Copyright (C) 2004-2014 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3. If not see
-<http://www.gnu.org/licenses/>. */
-
-#include "config.h"
-#include "system.h"
-#include "pointer-set.h"
-
-
-/* Use the multiplicative method, as described in Knuth 6.4, to obtain
- a hash code for P in the range [0, MAX). MAX == 2^LOGMAX.
-
- Summary of this method: Multiply p by some number A that's
- relatively prime to 2^sizeof(size_t). The result is two words.
- Discard the most significant word, and return the most significant
- N bits of the least significant word. As suggested by Knuth, our
- choice for A is the integer part of (ULONG_MAX + 1.0) / phi, where phi
- is the golden ratio.
-
- We don't need to do anything special for full-width multiplication
- because we're only interested in the least significant word of the
- product, and unsigned arithmetic in C is modulo the word size. */
-
-static inline size_t
-hash1 (const void *p, unsigned long max, unsigned long logmax)
-{
-#if HOST_BITS_PER_LONG == 32
- const unsigned long A = 0x9e3779b9u;
-#elif HOST_BITS_PER_LONG == 64
- const unsigned long A = 0x9e3779b97f4a7c16ul;
-#else
- const unsigned long A
- = (ULONG_MAX + 1.0L) * 0.6180339887498948482045868343656381177203L;
-#endif
- const unsigned long shift = HOST_BITS_PER_LONG - logmax;
-
- return ((A * (uintptr_t) p) >> shift) & (max - 1);
-}
-
-
-/* Allocate an empty pointer set. */
-struct pointer_set_t *
-pointer_set_create (void)
-{
- struct pointer_set_t *result = XNEW (struct pointer_set_t);
-
- result->n_elements = 0;
- result->log_slots = 8;
- result->n_slots = (size_t) 1 << result->log_slots;
-
- result->slots = XCNEWVEC (const void *, result->n_slots);
- return result;
-}
-
-/* Reclaims all memory associated with PSET. */
-void
-pointer_set_destroy (struct pointer_set_t *pset)
-{
- XDELETEVEC (pset->slots);
- XDELETE (pset);
-}
-
-
-/* Lookup the slot for the pointer P and return true if it exists,
- otherwise return false in which case *IX points to the slot that
- would be used on insertion. */
-
-bool
-pointer_set_lookup (const pointer_set_t *pset, const void *p, size_t *ix)
-{
- size_t n = hash1 (p, pset->n_slots, pset->log_slots);
-
- while (true)
- {
- if (pset->slots[n] == p)
- {
- *ix = n;
- return true;
- }
- else if (pset->slots[n] == 0)
- {
- *ix = n;
- return false;
- }
- else
- {
- ++n;
- if (n == pset->n_slots)
- n = 0;
- }
- }
-}
-
-/* Returns nonzero if PSET contains P. P must be nonnull.
-
- Collisions are resolved by linear probing. */
-int
-pointer_set_contains (const struct pointer_set_t *pset, const void *p)
-{
- size_t n;
- return pointer_set_lookup (pset, p, &n);
-}
-
-/* Inserts P into PSET if it wasn't already there. Returns nonzero
- if it was already there. P must be nonnull. */
-int
-pointer_set_insert (struct pointer_set_t *pset, const void *p)
-{
- size_t n;
-
- /* For simplicity, expand the set even if P is already there. This can be
- superfluous but can happen at most once. */
- if (pset->n_elements > pset->n_slots / 4)
- {
- size_t old_n_slots = pset->n_slots;
- const void **old_slots = pset->slots;
- pset->log_slots = pset->log_slots + 1;
- pset->n_slots = pset->n_slots * 2;
- pset->slots = XCNEWVEC (const void *, pset->n_slots);
- size_t i;
-
- for (i = 0; i < old_n_slots; ++i)
- {
- const void *value = old_slots[i];
- pointer_set_lookup (pset, value, &n);
- pset->slots[n] = value;
- }
-
- XDELETEVEC (old_slots);
- }
-
- if (pointer_set_lookup (pset, p, &n))
- return 1;
-
- pset->slots[n] = p;
- ++pset->n_elements;
- return 0;
-}
-
-/* Pass each pointer in PSET to the function in FN, together with the fixed
- parameter DATA. If FN returns false, the iteration stops. */
-
-void pointer_set_traverse (const struct pointer_set_t *pset,
- bool (*fn) (const void *, void *), void *data)
-{
- size_t i;
- for (i = 0; i < pset->n_slots; ++i)
- if (pset->slots[i] && !fn (pset->slots[i], data))
- break;
-}
-
-
-/* A pointer map is represented the same way as a pointer_set, so
- the hash code is based on the address of the key, rather than
- its contents. Null keys are a reserved value. Deletion is not
- supported (yet). There is no mechanism for user control of hash
- function, equality comparison, initial size, or resizing policy. */
-
-struct pointer_map_t
-{
- pointer_set_t pset;
- void **values;
-};
-
-/* Allocate an empty pointer map. */
-struct pointer_map_t *
-pointer_map_create (void)
-{
- struct pointer_map_t *result = XNEW (struct pointer_map_t);
-
- result->pset.n_elements = 0;
- result->pset.log_slots = 8;
- result->pset.n_slots = (size_t) 1 << result->pset.log_slots;
-
- result->pset.slots = XCNEWVEC (const void *, result->pset.n_slots);
- result->values = XCNEWVEC (void *, result->pset.n_slots);
- return result;
-}
-
-/* Reclaims all memory associated with PMAP. */
-void pointer_map_destroy (struct pointer_map_t *pmap)
-{
- XDELETEVEC (pmap->pset.slots);
- XDELETEVEC (pmap->values);
- XDELETE (pmap);
-}
-
-/* Returns a pointer to the value to which P maps, if PMAP contains P. P
- must be nonnull. Return NULL if PMAP does not contain P.
-
- Collisions are resolved by linear probing. */
-void **
-pointer_map_contains (const struct pointer_map_t *pmap, const void *p)
-{
- size_t n;
- if (pointer_set_lookup (&pmap->pset, p, &n))
- return &pmap->values[n];
- else
- return NULL;
-}
-
-/* Inserts P into PMAP if it wasn't already there. Returns a pointer
- to the value. P must be nonnull. */
-void **
-pointer_map_insert (struct pointer_map_t *pmap, const void *p)
-{
- size_t n;
-
- /* For simplicity, expand the map even if P is already there. This can be
- superfluous but can happen at most once. */
- if (pmap->pset.n_elements > pmap->pset.n_slots / 4)
- {
- size_t old_n_slots = pmap->pset.n_slots;
- const void **old_keys = pmap->pset.slots;
- void **old_values = pmap->values;
- pmap->pset.log_slots = pmap->pset.log_slots + 1;
- pmap->pset.n_slots = pmap->pset.n_slots * 2;
- pmap->pset.slots = XCNEWVEC (const void *, pmap->pset.n_slots);
- pmap->values = XCNEWVEC (void *, pmap->pset.n_slots);
- size_t i;
-
- for (i = 0; i < old_n_slots; ++i)
- if (old_keys[i])
- {
- const void *key = old_keys[i];
- pointer_set_lookup (&pmap->pset, key, &n);
- pmap->pset.slots[n] = key;
- pmap->values[n] = old_values[i];
- }
-
- XDELETEVEC (old_keys);
- XDELETEVEC (old_values);
- }
-
- if (!pointer_set_lookup (&pmap->pset, p, &n))
- {
- ++pmap->pset.n_elements;
- pmap->pset.slots[n] = p;
- }
-
- return &pmap->values[n];
-}
-
-/* Pass each pointer in PMAP to the function in FN, together with the pointer
- to the value and the fixed parameter DATA. If FN returns false, the
- iteration stops. */
-
-void pointer_map_traverse (const struct pointer_map_t *pmap,
- bool (*fn) (const void *, void **, void *), void *data)
-{
- size_t i;
- for (i = 0; i < pmap->pset.n_slots; ++i)
- if (pmap->pset.slots[i]
- && !fn (pmap->pset.slots[i], &pmap->values[i], data))
- break;
-}
diff --git a/gcc/pointer-set.h b/gcc/pointer-set.h
deleted file mode 100644
index fc592121872..00000000000
--- a/gcc/pointer-set.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Set operations on pointers
- Copyright (C) 2004-2014 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 3, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3. If not see
-<http://www.gnu.org/licenses/>. */
-
-#ifndef POINTER_SET_H
-#define POINTER_SET_H
-
-
-/* A pointer set is represented as a simple open-addressing hash
- table. Simplifications: The hash code is based on the value of the
- pointer, not what it points to. The number of buckets is always a
- power of 2. Null pointers are a reserved value. Deletion is not
- supported (yet). There is no mechanism for user control of hash
- function, equality comparison, initial size, or resizing policy. */
-
-struct pointer_set_t
-{
- size_t log_slots;
- size_t n_slots; /* n_slots = 2^log_slots */
- size_t n_elements;
- const void **slots;
-};
-
-struct pointer_set_t *pointer_set_create (void);
-void pointer_set_destroy (struct pointer_set_t *pset);
-int pointer_set_contains (const struct pointer_set_t *pset, const void *p);
-int pointer_set_insert (struct pointer_set_t *pset, const void *p);
-void pointer_set_traverse (const struct pointer_set_t *,
- bool (*) (const void *, void *),
- void *);
-bool pointer_set_lookup (const pointer_set_t *, const void *, size_t *);
-
-
-struct pointer_map_t;
-pointer_map_t *pointer_map_create (void);
-void pointer_map_destroy (pointer_map_t *pmap);
-
-void **pointer_map_contains (const pointer_map_t *pmap, const void *p);
-void **pointer_map_insert (pointer_map_t *pmap, const void *p);
-void pointer_map_traverse (const pointer_map_t *,
- bool (*) (const void *, void **, void *), void *);
-
-
-#endif /* POINTER_SET_H */
diff --git a/gcc/predict.c b/gcc/predict.c
index 34ebdc3658f..835c6181ffc 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -51,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "target.h"
#include "cfgloop.h"
-#include "pointer-set.h"
#include "hash-map.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 55ec279776f..8e6d3a5fd68 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "target.h"
#include "hash-set.h"
-#include "pointer-set.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/testsuite/g++.dg/plugin/selfassign.c b/gcc/testsuite/g++.dg/plugin/selfassign.c
index 508176ff21d..cfddada9e53 100644
--- a/gcc/testsuite/g++.dg/plugin/selfassign.c
+++ b/gcc/testsuite/g++.dg/plugin/selfassign.c
@@ -11,7 +11,6 @@
#include "stringpool.h"
#include "toplev.h"
#include "basic-block.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/finish_unit_plugin.c b/gcc/testsuite/gcc.dg/plugin/finish_unit_plugin.c
index c04d96d8232..1b4f7cc26fc 100644
--- a/gcc/testsuite/gcc.dg/plugin/finish_unit_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/finish_unit_plugin.c
@@ -9,7 +9,6 @@
#include "tree.h"
#include "toplev.h"
#include "basic-block.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/ggcplug.c b/gcc/testsuite/gcc.dg/plugin/ggcplug.c
index d441528e9de..65d848e9740 100644
--- a/gcc/testsuite/gcc.dg/plugin/ggcplug.c
+++ b/gcc/testsuite/gcc.dg/plugin/ggcplug.c
@@ -8,7 +8,6 @@
#include "tree.h"
#include "toplev.h"
#include "basic-block.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c b/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c
index d873d027837..bd1c0f0e579 100644
--- a/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c
@@ -6,7 +6,6 @@
#include "tree.h"
#include "tm.h"
#include "toplev.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/selfassign.c b/gcc/testsuite/gcc.dg/plugin/selfassign.c
index 227b6b002a6..80c59bb344a 100644
--- a/gcc/testsuite/gcc.dg/plugin/selfassign.c
+++ b/gcc/testsuite/gcc.dg/plugin/selfassign.c
@@ -11,7 +11,6 @@
#include "stringpool.h"
#include "toplev.h"
#include "basic-block.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/testsuite/gcc.dg/plugin/start_unit_plugin.c b/gcc/testsuite/gcc.dg/plugin/start_unit_plugin.c
index e83476b63fd..b98cf55eddd 100644
--- a/gcc/testsuite/gcc.dg/plugin/start_unit_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/start_unit_plugin.c
@@ -14,7 +14,6 @@
#include "stringpool.h"
#include "toplev.h"
#include "basic-block.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "vec.h"
#include "ggc.h"
diff --git a/gcc/tree-affine.c b/gcc/tree-affine.c
index 5c894ea6f78..18b44c15ed3 100644
--- a/gcc/tree-affine.c
+++ b/gcc/tree-affine.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "expr.h"
#include "tree-pretty-print.h"
-#include "pointer-set.h"
#include "tree-affine.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index cfa65273efb..9d1de01021c 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "function.h"
#include "gimple-pretty-print.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index db2818490a9..6c6faf30364 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "except.h"
#include "hash-set.h"
-#include "pointer-set.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index e2b7990b765..b6ecaa4b25a 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "tree-iterator.h"
#include "intl.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index 7d5c039927e..07d6c79a271 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -28,7 +28,6 @@
#include "function.h"
#include "tree-dump.h"
#include "tree-inline.h"
-#include "pointer-set.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index 3c40b003f02..248bb8db069 100644
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -280,7 +280,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa.h"
#include "cfgloop.h"
#include "tree-chrec.h"
-#include "pointer-set.h"
#include "tree-affine.h"
#include "tree-scalar-evolution.h"
#include "dumpfile.h"
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index 6239a7085f3..a3ebe729a6a 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "pointer-set.h"
#include "hash-map.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c
index c95cde84036..d4d3e539771 100644
--- a/gcc/tree-ssa-loop-niter.c
+++ b/gcc/tree-ssa-loop-niter.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "intl.h"
#include "hash-set.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 3185d9a6153..f62010fd2d9 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "hash-set.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 521d7786376..3f18d82da0e 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -30,7 +30,6 @@
#include "tree.h"
#include "stor-layout.h"
#include "stmt.h"
-#include "pointer-set.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c
index f2578b7e8f8..3b38fd480d3 100644
--- a/gcc/tree-ssa-uninit.c
+++ b/gcc/tree-ssa-uninit.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "bitmap.h"
#include "hash-set.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index fd12be7070f..b6b371801c5 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "function.h"
#include "gimple-pretty-print.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index d95cf78a56b..49cb5c03a31 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -52,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "basic-block.h"
#include "bitmap.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 3b72fce9e46..4f4780824aa 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -93,7 +93,6 @@
#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
-#include "pointer-set.h"
#include "hash-map.h"
#include "hash-table.h"
#include "basic-block.h"
diff --git a/gcc/varpool.c b/gcc/varpool.c
index 8350adb2d87..b5fe71ee1e9 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "gimple-expr.h"
#include "flags.h"
-#include "pointer-set.h"
#include "tree-ssa-alias.h"
#include "gimple.h"
#include "lto-streamer.h"