From: Bruno Ricci <riccibrun@gmail.com>
Date: Fri, 21 Sep 2018 13:11:39 +0000 (+0000)
Subject: [AST][NFC] Remove a superfluous enum in ObjCMethodDeclBitfields added in r338641
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cde569a8760722ce854b7055247562954fe55d39;p=clang

[AST][NFC] Remove a superfluous enum in ObjCMethodDeclBitfields added in r338641

I originally added this enum to avoid including Basic/IdentifierTable.h
in AST/DeclBase.h. However I did not realise it is already included
transitively by AST/DeclarationName.h. Therefore remove this enum and
explicitly include Basic/IdentifierTable.h



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@342731 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index 0d52120017..c174242a90 100644
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -16,6 +16,7 @@
 
 #include "clang/AST/AttrIterator.h"
 #include "clang/AST/DeclarationName.h"
+#include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/LLVM.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Basic/Specifiers.h"
@@ -1558,13 +1559,6 @@ class DeclContext {
   class ObjCMethodDeclBitfields {
     friend class ObjCMethodDecl;
 
-    /// This is needed for the bitwidth of Family below but
-    /// is defined in Basic/IdentifierTable.h which we do not include.
-    /// To avoid mismatches between the two definitions we have
-    /// a static_assert in the ctor of ObjCMethodDecl which checks
-    /// that these two ObjCMethodFamilyBitWidth are equal.
-    enum { ObjCMethodFamilyBitWidth = 4 };
-
     /// For the bits in DeclContextBitfields.
     uint64_t : NumDeclContextBits;