Basic: Introduce an x-macro for enumerating TypeIDZones

Author: slavapestov

include/swift/Basic/DefineTypeIDZone.h

@@ -45,14 +45,15 @@ template<> struct TypeIDZoneTypes<Zone::SWIFT_TYPEID_ZONE> {
 #undef SWIFT_TYPEID_NAMED
 #undef SWIFT_TYPEID_TEMPLATE1_NAMED
 #undef SWIFT_TYPEID_TEMPLATE2_NAMED
+    Count
   };
 };
 
 // Second pass: create specializations of TypeID for these types.
 #define SWIFT_TYPEID_NAMED(Type, Name)                       \
 template<> struct TypeID<Type> {                             \
-  static const uint8_t zoneID =                              \
-    static_cast<uint8_t>(Zone::SWIFT_TYPEID_ZONE);           \
+  static constexpr Zone zone = Zone::SWIFT_TYPEID_ZONE;      \
+  static const uint8_t zoneID = static_cast<uint8_t>(zone);  \
   static const uint8_t localID =                             \
     TypeIDZoneTypes<Zone::SWIFT_TYPEID_ZONE>::Name;          \
                                                              \

include/swift/Basic/TypeID.h

@@ -31,22 +31,9 @@
 namespace swift {
 
 enum class Zone : uint8_t {
-  C                       = 0,
-  AST                     = 1,
-  AccessControl           = 11,
-  IDETypes                = 136,
-  IDE                     = 137,
-  IDETypeChecking         = 97,
-  NameLookup              = 9,
-  Parse                   = 8,
-  TypeChecker             = 10,
-  SILGen                  = 12,
-  SILOptimizer            = 13,
-  TBDGen                  = 14,
-  IRGen                   = 20,
-
-  // N.B. This is not a formal zone and exists solely to support the unit tests.
-  ArithmeticEvaluator     = 255,
+#define SWIFT_TYPEID_ZONE(Name, Id) Name = Id,
+#include "swift/Basic/TypeIDZones.def"
+#undef SWIFT_TYPEID_ZONE
 };
 
 static_assert(std::is_same<std::underlying_type<Zone>::type, uint8_t>::value,

include/swift/Basic/TypeIDZones.def

@@ -0,0 +1,37 @@
+//===--- TypeIDZones.def - List of TypeID Zones -----------------*- C++ -*-===//
+ //
+ // This source file is part of the Swift.org open source project
+ //
+ // Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+ // Licensed under Apache License v2.0 with Runtime Library Exception
+ //
+ // See https://swift.org/LICENSE.txt for license information
+ // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ //  This definition file describes the zones for TypeID.
+ //
+ //===----------------------------------------------------------------------===//
+
+ SWIFT_TYPEID_ZONE(C, 0)
+ SWIFT_TYPEID_ZONE(AST, 1)
+
+ SWIFT_TYPEID_ZONE(Parse, 8)
+ SWIFT_TYPEID_ZONE(NameLookup, 9)
+
+ SWIFT_TYPEID_ZONE(TypeChecker, 10)
+ SWIFT_TYPEID_ZONE(AccessControl, 11)
+ SWIFT_TYPEID_ZONE(SILGen, 12)
+ SWIFT_TYPEID_ZONE(SILOptimizer, 13)
+ SWIFT_TYPEID_ZONE(TBDGen, 14)
+
+ SWIFT_TYPEID_ZONE(IRGen, 20)
+
+ SWIFT_TYPEID_ZONE(IDETypeChecking, 97)
+
+ SWIFT_TYPEID_ZONE(IDETypes, 136)
+ SWIFT_TYPEID_ZONE(IDE, 137)
+
+ // N.B. This is not a formal zone and exists solely to support the unit tests.
+ SWIFT_TYPEID_ZONE(ArithmeticEvaluator, 255)