avoid-store-forwarding: Fix include order and drop cselib.h include

The header file included config.h, system.h, coretypes.h,
backend.h, and rtl.h directly, which is unconventional for GCC
headers.  Strip those includes from the header and fix the include
order in the .cc file so that config.h comes first.  Also remove
the unused cselib.h include.

gcc/ChangeLog:

	* avoid-store-forwarding.cc: Move config.h before
	avoid-store-forwarding.h; place avoid-store-forwarding.h
	after rtl.h; remove unused cselib.h include.
	* avoid-store-forwarding.h: Remove includes of config.h,
	system.h, coretypes.h, backend.h, rtl.h.

Reviewed-By: Konstantinos Eleftheriou <konstantinos.eleftheriou@vrull.eu>

diff --git a/gcc/avoid-store-forwarding.cc b/gcc/avoid-store-forwarding.cc
index 86292ce574a280885ea729445ad9fad5d5824d8c..52235b14dc0df2a7fb7beb40b59454d8b7086080 100644 (file)
--- a/gcc/avoid-store-forwarding.cc
+++ b/gcc/avoid-store-forwarding.cc
@@ -18,18 +18,17 @@
    along with GCC; see the file COPYING3.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#include "avoid-store-forwarding.h"
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
 #include "target.h"
 #include "rtl.h"
+#include "avoid-store-forwarding.h"
 #include "alias.h"
 #include "rtlanal.h"
 #include "cfgrtl.h"
 #include "tree-pass.h"
-#include "cselib.h"
 #include "predict.h"
 #include "insn-config.h"
 #include "expmed.h"

diff --git a/gcc/avoid-store-forwarding.h b/gcc/avoid-store-forwarding.h
index 1650d687d5441a3592584489a1bb61af2ee5908d..8f455c6af7dc015880b843d07fe5248fdcdba577 100644 (file)
--- a/gcc/avoid-store-forwarding.h
+++ b/gcc/avoid-store-forwarding.h
@@ -21,12 +21,6 @@
 #ifndef GCC_AVOID_STORE_FORWARDING_H
 #define GCC_AVOID_STORE_FORWARDING_H
 
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "backend.h"
-#include "rtl.h"
-
 struct store_fwd_info
 {
   /* The store instruction that is a store forwarding candidate.  */