From ffd9cfa740c80416f07e39457ce571933de79613 Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Thu, 7 May 2020 17:14:14 +0100 Subject: [PATCH] AArch6/ARMTargetParser.h - move Triple.h dependency down to cpp file. NFC. Reduce Triple.h include to a forward declaration in the header. Only the implementations in the cpp files need the actual Triple class definition. --- llvm/include/llvm/Support/AArch64TargetParser.h | 4 +++- llvm/include/llvm/Support/ARMTargetParser.h | 4 +++- llvm/lib/Support/AArch64TargetParser.cpp | 2 +- llvm/lib/Support/ARMTargetParser.cpp | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/llvm/include/llvm/Support/AArch64TargetParser.h b/llvm/include/llvm/Support/AArch64TargetParser.h index f8b0c2d..a1d9543 100644 --- a/llvm/include/llvm/Support/AArch64TargetParser.h +++ b/llvm/include/llvm/Support/AArch64TargetParser.h @@ -15,12 +15,14 @@ #define LLVM_SUPPORT_AARCH64TARGETPARSERCOMMON_H #include "llvm/ADT/StringRef.h" -#include "llvm/ADT/Triple.h" #include "llvm/Support/ARMTargetParser.h" #include // FIXME:This should be made into class design,to avoid dupplication. namespace llvm { + +class Triple; + namespace AArch64 { // Arch extension modifiers for CPUs. diff --git a/llvm/include/llvm/Support/ARMTargetParser.h b/llvm/include/llvm/Support/ARMTargetParser.h index a378f73..322e89e 100644 --- a/llvm/include/llvm/Support/ARMTargetParser.h +++ b/llvm/include/llvm/Support/ARMTargetParser.h @@ -15,11 +15,13 @@ #define LLVM_SUPPORT_ARMTARGETPARSER_H #include "llvm/ADT/StringRef.h" -#include "llvm/ADT/Triple.h" #include "llvm/Support/ARMBuildAttributes.h" #include namespace llvm { + +class Triple; + namespace ARM { // Arch extension modifiers for CPUs. diff --git a/llvm/lib/Support/AArch64TargetParser.cpp b/llvm/lib/Support/AArch64TargetParser.cpp index cce2d82..a6de446 100644 --- a/llvm/lib/Support/AArch64TargetParser.cpp +++ b/llvm/lib/Support/AArch64TargetParser.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/AArch64TargetParser.h" -#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSwitch.h" +#include "llvm/ADT/Triple.h" #include using namespace llvm; diff --git a/llvm/lib/Support/ARMTargetParser.cpp b/llvm/lib/Support/ARMTargetParser.cpp index 2c58124..56a91f7d 100644 --- a/llvm/lib/Support/ARMTargetParser.cpp +++ b/llvm/lib/Support/ARMTargetParser.cpp @@ -13,6 +13,7 @@ #include "llvm/Support/ARMTargetParser.h" #include "llvm/ADT/StringSwitch.h" +#include "llvm/ADT/Triple.h" #include using namespace llvm; -- 2.7.4