From b10bd6dfc62161671892b2dd3be5152754d14995 Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Fri, 26 Jun 2020 13:48:51 -0700 Subject: [PATCH] [NFC] Bump ObjCOrBuiltinIDBits to 15 We're now hitting this because we're at the limit for number of builtins: clang/lib/Basic/IdentifierTable.cpp:39:1: error: static_assert failed due to requirement '2 * LargestBuiltinID < (2 << (ObjCOrBuiltinIDBits - 1))' "Insufficient ObjCOrBuiltinID Bits" static_assert(2 * LargestBuiltinID < (2 << (ObjCOrBuiltinIDBits - 1)), ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Bump it to 15 so whoever adds a builtin next (as I am, or as anyone else might) doesn't merge conflict over each other. --- clang/include/clang/Basic/IdentifierTable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/include/clang/Basic/IdentifierTable.h b/clang/include/clang/Basic/IdentifierTable.h index 31849bb..fc554a3 100644 --- a/clang/include/clang/Basic/IdentifierTable.h +++ b/clang/include/clang/Basic/IdentifierTable.h @@ -48,7 +48,7 @@ using IdentifierLocPair = std::pair; /// of a pointer to one of these classes. enum { IdentifierInfoAlignment = 8 }; -static constexpr int ObjCOrBuiltinIDBits = 14; +static constexpr int ObjCOrBuiltinIDBits = 15; /// One of these records is kept for each identifier that /// is lexed. This contains information about whether the token was \#define'd, -- 2.7.4