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

Causes lld build errors
---
 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, 3 insertions(+), 5 deletions(-)

diff --git a/llvm/include/llvm/Support/GlobPattern.h b/llvm/include/llvm/Support/GlobPattern.h
index b08b41d..0098ac6 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 f7c9907..8dae694 100644
--- a/llvm/lib/Support/GlobPattern.cpp
+++ b/llvm/lib/Support/GlobPattern.cpp
@@ -12,7 +12,6 @@
 
 #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 c143ac4..ff12e4b 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 95b6708..17d60b2 100644
--- a/llvm/unittests/Support/GlobPatternTest.cpp
+++ b/llvm/unittests/Support/GlobPatternTest.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/GlobPattern.h"
-#include "llvm/ADT/BitVector.h"
 #include "gtest/gtest.h"
 
 using namespace llvm;
-- 
2.7.4