From ca18ce1a00cd8b7cb7ce0e130440f5ae1ffe86ee Mon Sep 17 00:00:00 2001
From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Sun, 17 May 2020 18:29:27 +0100
Subject: [PATCH] GlobPattern.h - remove unnecessary BitVector.h/StringRef.h
 includes. NFC

Use forward declarations (BitVector already had one) and an headers to source file that were implicitly using them.
---
 llvm/include/llvm/Support/GlobPattern.h    | 4 ++--
 llvm/lib/Support/GlobPattern.cpp           | 1 +
 llvm/tools/llvm-objcopy/CopyConfig.cpp     | 2 +-
 llvm/unittests/Support/GlobPatternTest.cpp | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/llvm/include/llvm/Support/GlobPattern.h b/llvm/include/llvm/Support/GlobPattern.h
index 0098ac65fd3..b08b41d4a1c 100644
--- a/llvm/include/llvm/Support/GlobPattern.h
+++ b/llvm/include/llvm/Support/GlobPattern.h
@@ -14,16 +14,16 @@
 #ifndef LLVM_SUPPORT_GLOB_PATTERN_H
 #define LLVM_SUPPORT_GLOB_PATTERN_H
 
-#include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/Optional.h"
-#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"
 #include <vector>
 
 // This class represents a glob pattern. Supported metacharacters
 // are "*", "?", "\", "[<chars>]", "[^<chars>]", and "[!<chars>]".
 namespace llvm {
+
 class BitVector;
+class StringRef;
 template <typename T> class ArrayRef;
 
 class GlobPattern {
diff --git a/llvm/lib/Support/GlobPattern.cpp b/llvm/lib/Support/GlobPattern.cpp
index 8dae6941ec7..f7c99075c89 100644
--- a/llvm/lib/Support/GlobPattern.cpp
+++ b/llvm/lib/Support/GlobPattern.cpp
@@ -12,6 +12,7 @@
 
 #include "llvm/Support/GlobPattern.h"
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Errc.h"
diff --git a/llvm/tools/llvm-objcopy/CopyConfig.cpp b/llvm/tools/llvm-objcopy/CopyConfig.cpp
index ff12e4bd89f..c143ac40448 100644
--- a/llvm/tools/llvm-objcopy/CopyConfig.cpp
+++ b/llvm/tools/llvm-objcopy/CopyConfig.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "CopyConfig.h"
-
+#include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
diff --git a/llvm/unittests/Support/GlobPatternTest.cpp b/llvm/unittests/Support/GlobPatternTest.cpp
index 17d60b2b850..95b67082534 100644
--- a/llvm/unittests/Support/GlobPatternTest.cpp
+++ b/llvm/unittests/Support/GlobPatternTest.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/GlobPattern.h"
+#include "llvm/ADT/BitVector.h"
 #include "gtest/gtest.h"
 
 using namespace llvm;
-- 
2.11.0