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 <[email protected]>
---
gcc/avoid-store-forwarding.cc | 3 +--
gcc/avoid-store-forwarding.h | 6 ------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/gcc/avoid-store-forwarding.cc b/gcc/avoid-store-forwarding.cc
index 86292ce574a2..52235b14dc0d 100644
--- 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 1650d687d544..8f455c6af7dc 100644
--- 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. */
--
2.34.1
