Skip to content

Commit a4be1fe

Browse files
swift-ciswift-ci
committed
---
yaml --- r: 348391 b: refs/heads/master c: f45e1c9 h: refs/heads/master i: 348389: 60f384b 348387: 5be58a3 348383: 5b73be2
1 parent c4166fb commit a4be1fe

27 files changed

+151
-140
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 8d54d18d0eb60ab2d9c95a00ecb076fb446fd776
2+
refs/heads/master: f45e1c980cc4a1a579636671fc51a675b6cd4d71
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

‎trunk/include/swift/AST/ASTTypeIDs.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ class Type;
3636
struct TypePair;
3737
enum class AncestryFlags : uint8_t;
3838

39-
#define SWIFT_AST_TYPEID_ZONE 1
40-
4139
// Define the AST type zone (zone 1)
42-
#define SWIFT_TYPEID_ZONE SWIFT_AST_TYPEID_ZONE
40+
#define SWIFT_TYPEID_ZONE AST
4341
#define SWIFT_TYPEID_HEADER "swift/AST/ASTTypeIDZone.def"
4442
#include "swift/Basic/DefineTypeIDZone.h"
4543

‎trunk/include/swift/AST/AccessRequests.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,24 +97,21 @@ class DefaultAndMaxAccessLevelRequest :
9797
void cacheResult(DefaultAndMax value) const;
9898
};
9999

100-
/// The zone number for access-control requests.
101-
#define SWIFT_ACCESS_REQUESTS_TYPEID_ZONE 11
102-
103-
#define SWIFT_TYPEID_ZONE SWIFT_ACCESS_REQUESTS_TYPEID_ZONE
100+
#define SWIFT_TYPEID_ZONE AccessControl
104101
#define SWIFT_TYPEID_HEADER "swift/AST/AccessTypeIDZone.def"
105102
#include "swift/Basic/DefineTypeIDZone.h"
106103
#undef SWIFT_TYPEID_ZONE
107104
#undef SWIFT_TYPEID_HEADER
108105

109106
// Set up reporting of evaluated requests.
110-
#define SWIFT_TYPEID(RequestType) \
107+
#define SWIFT_REQUEST(Zone, RequestType) \
111108
template<> \
112109
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
113110
const RequestType &request) { \
114111
++stats.getFrontendCounters().RequestType; \
115112
}
116113
#include "swift/AST/AccessTypeIDZone.def"
117-
#undef SWIFT_TYPEID
114+
#undef SWIFT_REQUEST
118115

119116
} // end namespace swift
120117

‎trunk/include/swift/AST/AccessTypeIDZone.def

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
// TypeID zone, for use with the TypeID template.
1515
//
1616
//===----------------------------------------------------------------------===//
17-
SWIFT_TYPEID(AccessLevelRequest)
18-
SWIFT_TYPEID(SetterAccessLevelRequest)
19-
SWIFT_TYPEID(DefaultAndMaxAccessLevelRequest)
17+
SWIFT_REQUEST(AccessControl, AccessLevelRequest)
18+
SWIFT_REQUEST(AccessControl, SetterAccessLevelRequest)
19+
SWIFT_REQUEST(AccessControl, DefaultAndMaxAccessLevelRequest)

‎trunk/include/swift/AST/Evaluator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ class Evaluator {
249249
///
250250
/// These functions will be called to evaluate any requests within that
251251
/// zone.
252-
void registerRequestFunctions(uint8_t zoneID,
252+
void registerRequestFunctions(Zone zone,
253253
ArrayRef<AbstractRequestFunction *> functions);
254254

255255
/// Evaluate the given request and produce its result,

‎trunk/include/swift/AST/NameLookupRequests.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,7 @@ class GetDestructorRequest :
254254
void cacheResult(DestructorDecl *value) const;
255255
};
256256

257-
/// The zone number for name-lookup requests.
258-
#define SWIFT_NAME_LOOKUP_REQUESTS_TYPEID_ZONE 9
259-
260-
#define SWIFT_TYPEID_ZONE SWIFT_NAME_LOOKUP_REQUESTS_TYPEID_ZONE
257+
#define SWIFT_TYPEID_ZONE NameLookup
261258
#define SWIFT_TYPEID_HEADER "swift/AST/NameLookupTypeIDZone.def"
262259
#include "swift/Basic/DefineTypeIDZone.h"
263260
#undef SWIFT_TYPEID_ZONE
@@ -268,14 +265,14 @@ template<typename Request>
268265
void reportEvaluatedRequest(UnifiedStatsReporter &stats,
269266
const Request &request);
270267

271-
#define SWIFT_TYPEID(RequestType) \
268+
#define SWIFT_REQUEST(Zone, RequestType) \
272269
template<> \
273270
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
274271
const RequestType &request) { \
275272
++stats.getFrontendCounters().RequestType; \
276273
}
277274
#include "swift/AST/NameLookupTypeIDZone.def"
278-
#undef SWIFT_TYPEID
275+
#undef SWIFT_REQUEST
279276

280277
} // end namespace swift
281278

‎trunk/include/swift/AST/NameLookupTypeIDZone.def

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
// TypeID zone, for use with the TypeID template.
1515
//
1616
//===----------------------------------------------------------------------===//
17-
SWIFT_TYPEID(InheritedDeclsReferencedRequest)
18-
SWIFT_TYPEID(UnderlyingTypeDeclsReferencedRequest)
19-
SWIFT_TYPEID(SuperclassDeclRequest)
20-
SWIFT_TYPEID(ExtendedNominalRequest)
21-
SWIFT_TYPEID(SelfBoundsFromWhereClauseRequest)
22-
SWIFT_TYPEID(TypeDeclsFromWhereClauseRequest)
23-
SWIFT_TYPEID(CustomAttrNominalRequest)
24-
SWIFT_TYPEID(GetDestructorRequest)
17+
SWIFT_REQUEST(NameLookup, InheritedDeclsReferencedRequest)
18+
SWIFT_REQUEST(NameLookup, UnderlyingTypeDeclsReferencedRequest)
19+
SWIFT_REQUEST(NameLookup, SuperclassDeclRequest)
20+
SWIFT_REQUEST(NameLookup, ExtendedNominalRequest)
21+
SWIFT_REQUEST(NameLookup, SelfBoundsFromWhereClauseRequest)
22+
SWIFT_REQUEST(NameLookup, TypeDeclsFromWhereClauseRequest)
23+
SWIFT_REQUEST(NameLookup, CustomAttrNominalRequest)
24+
SWIFT_REQUEST(NameLookup, GetDestructorRequest)

‎trunk/include/swift/AST/TypeCheckRequests.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,24 +1150,21 @@ inline bool AnyValue::Holder<Type>::equals(const HolderBase &other) const {
11501150

11511151
void simple_display(llvm::raw_ostream &out, Type value);
11521152

1153-
/// The zone number for the type checker.
1154-
#define SWIFT_TYPE_CHECKER_REQUESTS_TYPEID_ZONE 10
1155-
1156-
#define SWIFT_TYPEID_ZONE SWIFT_TYPE_CHECKER_REQUESTS_TYPEID_ZONE
1153+
#define SWIFT_TYPEID_ZONE TypeChecker
11571154
#define SWIFT_TYPEID_HEADER "swift/AST/TypeCheckerTypeIDZone.def"
11581155
#include "swift/Basic/DefineTypeIDZone.h"
11591156
#undef SWIFT_TYPEID_ZONE
11601157
#undef SWIFT_TYPEID_HEADER
11611158

11621159
// Set up reporting of evaluated requests.
1163-
#define SWIFT_TYPEID(RequestType) \
1160+
#define SWIFT_REQUEST(Zone, RequestType) \
11641161
template<> \
11651162
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
11661163
const RequestType &request) { \
11671164
++stats.getFrontendCounters().RequestType; \
11681165
}
11691166
#include "swift/AST/TypeCheckerTypeIDZone.def"
1170-
#undef SWIFT_TYPEID
1167+
#undef SWIFT_REQUEST
11711168

11721169
} // end namespace swift
11731170

‎trunk/include/swift/AST/TypeCheckerTypeIDZone.def

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,49 +14,50 @@
1414
// TypeID zone, for use with the TypeID template.
1515
//
1616
//===----------------------------------------------------------------------===//
17-
SWIFT_TYPEID(InheritedTypeRequest)
18-
SWIFT_TYPEID(SuperclassTypeRequest)
19-
SWIFT_TYPEID(EnumRawTypeRequest)
20-
SWIFT_TYPEID(OverriddenDeclsRequest)
21-
SWIFT_TYPEID(IsObjCRequest)
22-
SWIFT_TYPEID(InitKindRequest)
23-
SWIFT_TYPEID(ProtocolRequiresClassRequest)
24-
SWIFT_TYPEID(ExistentialConformsToSelfRequest)
25-
SWIFT_TYPEID(ExistentialTypeSupportedRequest)
26-
SWIFT_TYPEID(IsFinalRequest)
27-
SWIFT_TYPEID(IsDynamicRequest)
28-
SWIFT_TYPEID(RequirementRequest)
29-
SWIFT_TYPEID(RequirementSignatureRequest)
30-
SWIFT_TYPEID(DefaultDefinitionTypeRequest)
31-
SWIFT_TYPEID(USRGenerationRequest)
32-
SWIFT_TYPEID(StructuralTypeRequest)
33-
SWIFT_TYPEID(ResilienceExpansionRequest)
34-
SWIFT_TYPEID(DefaultTypeRequest)
35-
SWIFT_TYPEID(MangleLocalTypeDeclRequest)
36-
SWIFT_TYPEID(PropertyWrapperTypeInfoRequest)
37-
SWIFT_TYPEID(PropertyWrapperMutabilityRequest)
38-
SWIFT_TYPEID(AttachedPropertyWrappersRequest)
39-
SWIFT_TYPEID(AttachedPropertyWrapperTypeRequest)
40-
SWIFT_TYPEID(PropertyWrapperBackingPropertyTypeRequest)
41-
SWIFT_TYPEID(PropertyWrapperBackingPropertyInfoRequest)
42-
SWIFT_TYPEID(AttachedFunctionBuilderRequest)
43-
SWIFT_TYPEID(FunctionBuilderTypeRequest)
44-
SWIFT_TYPEID(SelfAccessKindRequest)
45-
SWIFT_TYPEID(IsGetterMutatingRequest)
46-
SWIFT_TYPEID(IsSetterMutatingRequest)
47-
SWIFT_TYPEID(OpaqueReadOwnershipRequest)
48-
SWIFT_TYPEID(LazyStoragePropertyRequest)
49-
SWIFT_TYPEID(TypeCheckFunctionBodyUntilRequest)
50-
SWIFT_TYPEID(StoredPropertiesRequest)
51-
SWIFT_TYPEID(StoredPropertiesAndMissingMembersRequest)
52-
SWIFT_TYPEID(StorageImplInfoRequest)
53-
SWIFT_TYPEID(RequiresOpaqueAccessorsRequest)
54-
SWIFT_TYPEID(RequiresOpaqueModifyCoroutineRequest)
55-
SWIFT_TYPEID(IsAccessorTransparentRequest)
56-
SWIFT_TYPEID(SynthesizeAccessorRequest)
57-
SWIFT_TYPEID(EmittedMembersRequest)
58-
SWIFT_TYPEID(IsImplicitlyUnwrappedOptionalRequest)
59-
SWIFT_TYPEID(ClassAncestryFlagsRequest)
60-
SWIFT_TYPEID(AbstractGenericSignatureRequest)
61-
SWIFT_TYPEID(ExtendedTypeRequest)
62-
SWIFT_TYPEID(FunctionOperatorRequest)
17+
18+
SWIFT_REQUEST(TypeChecker, InheritedTypeRequest)
19+
SWIFT_REQUEST(TypeChecker, SuperclassTypeRequest)
20+
SWIFT_REQUEST(TypeChecker, EnumRawTypeRequest)
21+
SWIFT_REQUEST(TypeChecker, OverriddenDeclsRequest)
22+
SWIFT_REQUEST(TypeChecker, IsObjCRequest)
23+
SWIFT_REQUEST(TypeChecker, InitKindRequest)
24+
SWIFT_REQUEST(TypeChecker, ProtocolRequiresClassRequest)
25+
SWIFT_REQUEST(TypeChecker, ExistentialConformsToSelfRequest)
26+
SWIFT_REQUEST(TypeChecker, ExistentialTypeSupportedRequest)
27+
SWIFT_REQUEST(TypeChecker, IsFinalRequest)
28+
SWIFT_REQUEST(TypeChecker, IsDynamicRequest)
29+
SWIFT_REQUEST(TypeChecker, RequirementRequest)
30+
SWIFT_REQUEST(TypeChecker, RequirementSignatureRequest)
31+
SWIFT_REQUEST(TypeChecker, DefaultDefinitionTypeRequest)
32+
SWIFT_REQUEST(TypeChecker, USRGenerationRequest)
33+
SWIFT_REQUEST(TypeChecker, StructuralTypeRequest)
34+
SWIFT_REQUEST(TypeChecker, ResilienceExpansionRequest)
35+
SWIFT_REQUEST(TypeChecker, DefaultTypeRequest)
36+
SWIFT_REQUEST(TypeChecker, MangleLocalTypeDeclRequest)
37+
SWIFT_REQUEST(TypeChecker, PropertyWrapperTypeInfoRequest)
38+
SWIFT_REQUEST(TypeChecker, PropertyWrapperMutabilityRequest)
39+
SWIFT_REQUEST(TypeChecker, AttachedPropertyWrappersRequest)
40+
SWIFT_REQUEST(TypeChecker, AttachedPropertyWrapperTypeRequest)
41+
SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyTypeRequest)
42+
SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyInfoRequest)
43+
SWIFT_REQUEST(TypeChecker, AttachedFunctionBuilderRequest)
44+
SWIFT_REQUEST(TypeChecker, FunctionBuilderTypeRequest)
45+
SWIFT_REQUEST(TypeChecker, SelfAccessKindRequest)
46+
SWIFT_REQUEST(TypeChecker, IsGetterMutatingRequest)
47+
SWIFT_REQUEST(TypeChecker, IsSetterMutatingRequest)
48+
SWIFT_REQUEST(TypeChecker, OpaqueReadOwnershipRequest)
49+
SWIFT_REQUEST(TypeChecker, LazyStoragePropertyRequest)
50+
SWIFT_REQUEST(TypeChecker, TypeCheckFunctionBodyUntilRequest)
51+
SWIFT_REQUEST(TypeChecker, StoredPropertiesRequest)
52+
SWIFT_REQUEST(TypeChecker, StoredPropertiesAndMissingMembersRequest)
53+
SWIFT_REQUEST(TypeChecker, StorageImplInfoRequest)
54+
SWIFT_REQUEST(TypeChecker, RequiresOpaqueAccessorsRequest)
55+
SWIFT_REQUEST(TypeChecker, RequiresOpaqueModifyCoroutineRequest)
56+
SWIFT_REQUEST(TypeChecker, IsAccessorTransparentRequest)
57+
SWIFT_REQUEST(TypeChecker, SynthesizeAccessorRequest)
58+
SWIFT_REQUEST(TypeChecker, EmittedMembersRequest)
59+
SWIFT_REQUEST(TypeChecker, IsImplicitlyUnwrappedOptionalRequest)
60+
SWIFT_REQUEST(TypeChecker, ClassAncestryFlagsRequest)
61+
SWIFT_REQUEST(TypeChecker, AbstractGenericSignatureRequest)
62+
SWIFT_REQUEST(TypeChecker, ExtendedTypeRequest)
63+
SWIFT_REQUEST(TypeChecker, FunctionOperatorRequest)

‎trunk/include/swift/Basic/DefineTypeIDZone.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333

3434
// Define a TypeID where the type name and internal name are the same.
3535
#define SWIFT_TYPEID(Type) SWIFT_TYPEID_NAMED(Type, Type)
36+
#define SWIFT_REQUEST(Zone, Type) SWIFT_TYPEID_NAMED(Type, Type)
3637

3738
// First pass: put all of the names into an enum so we get values for them.
38-
template<> struct TypeIDZoneTypes<SWIFT_TYPEID_ZONE> {
39+
template<> struct TypeIDZoneTypes<Zone::SWIFT_TYPEID_ZONE> {
3940
enum Types : uint8_t {
4041
#define SWIFT_TYPEID_NAMED(Type, Name) Name,
4142
#define SWIFT_TYPEID_TEMPLATE1_NAMED(Template, Name, Param1, Arg1) Name,
@@ -48,9 +49,10 @@ template<> struct TypeIDZoneTypes<SWIFT_TYPEID_ZONE> {
4849
// Second pass: create specializations of TypeID for these types.
4950
#define SWIFT_TYPEID_NAMED(Type, Name) \
5051
template<> struct TypeID<Type> { \
51-
static const uint8_t zoneID = SWIFT_TYPEID_ZONE; \
52+
static const uint8_t zoneID = \
53+
static_cast<uint8_t>(Zone::SWIFT_TYPEID_ZONE); \
5254
static const uint8_t localID = \
53-
TypeIDZoneTypes<SWIFT_TYPEID_ZONE>::Name; \
55+
TypeIDZoneTypes<Zone::SWIFT_TYPEID_ZONE>::Name; \
5456
\
5557
static const uint64_t value = formTypeID(zoneID, localID); \
5658
\
@@ -61,8 +63,8 @@ template<> struct TypeID<Type> { \
6163
template<Param1> struct TypeID<Template<Arg1>> { \
6264
private: \
6365
static const uint64_t templateID = \
64-
formTypeID(SWIFT_TYPEID_ZONE, \
65-
TypeIDZoneTypes<SWIFT_TYPEID_ZONE>::Name); \
66+
formTypeID(static_cast<uint8_t>(Zone::SWIFT_TYPEID_ZONE), \
67+
TypeIDZoneTypes<Zone::SWIFT_TYPEID_ZONE>::Name); \
6668
\
6769
public: \
6870
static const uint64_t value = \
@@ -76,6 +78,9 @@ public: \
7678
template<Param1> const uint64_t TypeID<Template<Arg1>>::value;
7779

7880
#include SWIFT_TYPEID_HEADER
81+
82+
#undef SWIFT_REQUEST
83+
7984
#undef SWIFT_TYPEID_NAMED
8085
#undef SWIFT_TYPEID_TEMPLATE1_NAMED
8186

‎trunk/include/swift/Basic/ImplementTypeIDZone.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#endif
3434

3535
// Define a TypeID where the type name and internal name are the same.
36+
#define SWIFT_REQUEST(Zone, Type) SWIFT_TYPEID_NAMED(Type, Type)
3637
#define SWIFT_TYPEID(Type) SWIFT_TYPEID_NAMED(Type, Type)
3738

3839
// Out-of-line definitions.
@@ -43,6 +44,8 @@
4344

4445
#include SWIFT_TYPEID_HEADER
4546

47+
#undef SWIFT_REQUEST
48+
4649
#undef SWIFT_TYPEID_NAMED
4750
#undef SWIFT_TYPEID_TEMPLATE1_NAMED
4851

‎trunk/include/swift/Basic/Statistics.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,13 @@ FRONTEND_STATISTIC(Sema, NumUnloadedLazyIterableDeclContexts)
268268
/// Number of lookups into a module and its imports.
269269

270270
/// All type check requests go into the Sema area.
271-
#define SWIFT_TYPEID(NAME) FRONTEND_STATISTIC(Sema, NAME)
271+
#define SWIFT_REQUEST(ZONE, NAME) FRONTEND_STATISTIC(Sema, NAME)
272272
#include "swift/AST/AccessTypeIDZone.def"
273273
#include "swift/AST/NameLookupTypeIDZone.def"
274274
#include "swift/AST/TypeCheckerTypeIDZone.def"
275275
#include "swift/Sema/IDETypeCheckingRequestIDZone.def"
276276
#include "swift/IDE/IDERequestIDZone.def"
277-
#undef SWIFT_TYPEID
277+
#undef SWIFT_REQUEST
278278

279279
/// The next 10 statistics count 5 kinds of SIL entities present
280280
/// after the SILGen and SILOpt phases. The entities are functions,

‎trunk/include/swift/Basic/TypeID.h

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,22 @@
2727

2828
namespace swift {
2929

30+
enum class Zone : uint8_t {
31+
C = 0,
32+
AST = 1,
33+
AccessControl = 11,
34+
IDETypes = 136,
35+
IDE = 137,
36+
IDETypeChecking = 97,
37+
NameLookup = 9,
38+
TypeChecker = 10,
39+
// N.B. This is not a formal zone and exists solely to support the unit tests.
40+
ArithmeticEvaluator = 255,
41+
};
42+
43+
static_assert(std::is_same<std::underlying_type<Zone>::type, uint8_t>::value,
44+
"underlying type is no longer uint8_t!");
45+
3046
/// Form a unique 64-bit integer value describing the type `T`.
3147
///
3248
/// This template needs to be specialized for every type that can
@@ -37,15 +53,15 @@ struct TypeID;
3753

3854
/// Template whose specializations provide the set of type IDs within a
3955
/// given zone.
40-
template<uint8_t Zone> struct TypeIDZoneTypes;
56+
template<Zone Zone> struct TypeIDZoneTypes;
4157

4258
/// Form a type ID given a zone and type value.
4359
constexpr uint64_t formTypeID(uint8_t zone, uint8_t type) {
4460
return (uint64_t(zone) << 8) | uint64_t(type);
4561
}
4662

4763
// Define the C type zone (zone 0).
48-
#define SWIFT_TYPEID_ZONE 0
64+
#define SWIFT_TYPEID_ZONE C
4965
#define SWIFT_TYPEID_HEADER "swift/Basic/CTypeIDZone.def"
5066
#include "swift/Basic/DefineTypeIDZone.h"
5167

‎trunk/include/swift/IDE/IDERequestIDZone.def

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
// TypeID zone, for use with the TypeID template.
1515
//
1616
//===----------------------------------------------------------------------===//
17-
SWIFT_TYPEID(CursorInfoRequest)
18-
SWIFT_TYPEID(RangeInfoRequest)
19-
SWIFT_TYPEID(ProvideDefaultImplForRequest)
20-
SWIFT_TYPEID(CollectOverriddenDeclsRequest)
21-
SWIFT_TYPEID(ResolveProtocolNameRequest)
17+
SWIFT_REQUEST(IDE, CursorInfoRequest)
18+
SWIFT_REQUEST(IDE, RangeInfoRequest)
19+
SWIFT_REQUEST(IDE, ProvideDefaultImplForRequest)
20+
SWIFT_REQUEST(IDE, CollectOverriddenDeclsRequest)
21+
SWIFT_REQUEST(IDE, ResolveProtocolNameRequest)

‎trunk/include/swift/IDE/IDERequests.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,22 +282,21 @@ class ResolveProtocolNameRequest:
282282
};
283283

284284
/// The zone number for the IDE.
285-
#define SWIFT_IDE_REQUESTS_TYPEID_ZONE 137
286-
#define SWIFT_TYPEID_ZONE SWIFT_IDE_REQUESTS_TYPEID_ZONE
285+
#define SWIFT_TYPEID_ZONE IDE
287286
#define SWIFT_TYPEID_HEADER "swift/IDE/IDERequestIDZone.def"
288287
#include "swift/Basic/DefineTypeIDZone.h"
289288
#undef SWIFT_TYPEID_ZONE
290289
#undef SWIFT_TYPEID_HEADER
291290

292291
// Set up reporting of evaluated requests.
293-
#define SWIFT_TYPEID(RequestType) \
292+
#define SWIFT_REQUEST(Zone, RequestType) \
294293
template<> \
295294
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
296295
const RequestType &request) { \
297296
++stats.getFrontendCounters().RequestType; \
298297
}
299298
#include "swift/IDE/IDERequestIDZone.def"
300-
#undef SWIFT_TYPEID
299+
#undef SWIFT_REQUEST
301300

302301
} // end namespace swift
303302

0 commit comments

Comments
 (0)