Skip to content

Commit 7370c60

Browse files
CodaFiCodaFi
authored
---
yaml --- r: 343609 b: refs/heads/master-rebranch c: ac3dcb1 h: refs/heads/master i: 343607: dec7091
1 parent 111d383 commit 7370c60

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+601
-455
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
14551455
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
14561456
refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
14571457
refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
1458-
refs/heads/master-rebranch: bea0a6ad284475d5a9cbd6fc40b513a5f3e3d1b4
1458+
refs/heads/master-rebranch: ac3dcb1cff174a1ea5ebcb2a24036f5ef4dcc8ed
14591459
refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
14601460
refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
14611461
refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

‎branches/master-rebranch/include/swift/AST/AccessRequests.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ class DefaultAndMaxAccessLevelRequest :
105105
#undef SWIFT_TYPEID_HEADER
106106

107107
// Set up reporting of evaluated requests.
108-
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching) \
109-
template<> \
110-
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
111-
const RequestType &request) { \
112-
++stats.getFrontendCounters().RequestType; \
113-
}
108+
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching, LocOptions) \
109+
template <> \
110+
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
111+
const RequestType &request) { \
112+
++stats.getFrontendCounters().RequestType; \
113+
}
114114
#include "swift/AST/AccessTypeIDZone.def"
115115
#undef SWIFT_REQUEST
116116

‎branches/master-rebranch/include/swift/AST/AccessTypeIDZone.def

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
//===----------------------------------------------------------------------===//
1717

1818
SWIFT_REQUEST(AccessControl, AccessLevelRequest, AccessLevel(ValueDecl *),
19-
SeparatelyCached)
19+
SeparatelyCached, NoLocationInfo)
2020
SWIFT_REQUEST(AccessControl, DefaultAndMaxAccessLevelRequest,
21-
DefaultAndMax(ExtensionDecl *), SeparatelyCached)
21+
DefaultAndMax(ExtensionDecl *), SeparatelyCached, NoLocationInfo)
2222
SWIFT_REQUEST(AccessControl, SetterAccessLevelRequest,
23-
AccessLevel(AbstractStorageDecl *), SeparatelyCached)
23+
AccessLevel(AbstractStorageDecl *), SeparatelyCached,
24+
NoLocationInfo)

‎branches/master-rebranch/include/swift/AST/DiagnosticsSema.def

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1616,6 +1616,11 @@ ERROR(inferred_opaque_type,none,
16161616
// Extensions
16171617
ERROR(non_nominal_extension,none,
16181618
"non-nominal type %0 cannot be extended", (Type))
1619+
WARNING(composition_in_extended_type,none,
1620+
"extending a protocol composition is not supported; extending %0 "
1621+
"instead", (Type))
1622+
NOTE(composition_in_extended_type_alternative,none,
1623+
"did you mean to extend the most specific type %0 instead?", (Type))
16191624
ERROR(extension_access_with_conformances,none,
16201625
"%0 modifier cannot be used with extensions that declare "
16211626
"protocol conformances", (DeclAttribute))

‎branches/master-rebranch/include/swift/AST/NameLookup.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,17 @@ getDirectlyInheritedNominalTypeDecls(
448448
SelfBounds getSelfBoundsFromWhereClause(
449449
llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl);
450450

451+
/// Retrieve the TypeLoc at the given \c index from among the set of
452+
/// type declarations that are directly "inherited" by the given declaration.
453+
inline TypeLoc &
454+
getInheritedTypeLocAtIndex(llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
455+
unsigned index) {
456+
if (auto typeDecl = decl.dyn_cast<TypeDecl *>())
457+
return typeDecl->getInherited()[index];
458+
459+
return decl.get<ExtensionDecl *>()->getInherited()[index];
460+
}
461+
451462
namespace namelookup {
452463

453464
/// Searches through statements and patterns for local variable declarations.

‎branches/master-rebranch/include/swift/AST/NameLookupRequests.h

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ class InheritedDeclsReferencedRequest :
6262
unsigned),
6363
CacheKind::Uncached> // FIXME: Cache these
6464
{
65-
/// Retrieve the TypeLoc for this inherited type.
66-
TypeLoc &getTypeLoc(llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
67-
unsigned index) const;
68-
6965
public:
7066
using SimpleRequest::SimpleRequest;
7167

@@ -265,12 +261,12 @@ template<typename Request>
265261
void reportEvaluatedRequest(UnifiedStatsReporter &stats,
266262
const Request &request);
267263

268-
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching) \
269-
template<> \
270-
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
271-
const RequestType &request) { \
272-
++stats.getFrontendCounters().RequestType; \
273-
}
264+
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching, LocOptions) \
265+
template <> \
266+
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
267+
const RequestType &request) { \
268+
++stats.getFrontendCounters().RequestType; \
269+
}
274270
#include "swift/AST/NameLookupTypeIDZone.def"
275271
#undef SWIFT_REQUEST
276272

‎branches/master-rebranch/include/swift/AST/NameLookupTypeIDZone.def

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,25 @@
1616
//===----------------------------------------------------------------------===//
1717

1818
SWIFT_REQUEST(NameLookup, CustomAttrNominalRequest,
19-
NominalTypeDecl *(CustomAttr *, DeclContext *), Cached)
19+
NominalTypeDecl *(CustomAttr *, DeclContext *), Cached,
20+
NoLocationInfo)
2021
SWIFT_REQUEST(NameLookup, ExtendedNominalRequest,
21-
NominalTypeDecl *(ExtensionDecl *), SeparatelyCached)
22+
NominalTypeDecl *(ExtensionDecl *), SeparatelyCached,
23+
NoLocationInfo)
2224
SWIFT_REQUEST(NameLookup, GetDestructorRequest, DestructorDecl *(ClassDecl *),
23-
SeparatelyCached)
25+
SeparatelyCached, NoLocationInfo)
2426
SWIFT_REQUEST(NameLookup, InheritedDeclsReferencedRequest,
2527
DirectlyReferencedTypeDecls(
2628
llvm::PointerUnion<TypeDecl *, ExtensionDecl *>, unsigned),
27-
Uncached)
29+
Uncached, HasNearestLocation)
2830
SWIFT_REQUEST(NameLookup, SelfBoundsFromWhereClauseRequest,
2931
SelfBounds(llvm::PointerUnion<TypeDecl *, ExtensionDecl *>),
30-
Uncached)
32+
Uncached, NoLocationInfo)
3133
SWIFT_REQUEST(NameLookup, SuperclassDeclRequest, ClassDecl *(NominalTypeDecl *),
32-
SeparatelyCached)
34+
SeparatelyCached, NoLocationInfo)
3335
SWIFT_REQUEST(NameLookup, TypeDeclsFromWhereClauseRequest,
34-
DirectlyReferencedTypeDecls(ExtensionDecl *), Uncached)
36+
DirectlyReferencedTypeDecls(ExtensionDecl *), Uncached,
37+
NoLocationInfo)
3538
SWIFT_REQUEST(NameLookup, UnderlyingTypeDeclsReferencedRequest,
36-
DirectlyReferencedTypeDecls(TypeAliasDecl *), Uncached)
39+
DirectlyReferencedTypeDecls(TypeAliasDecl *), Uncached,
40+
NoLocationInfo)

‎branches/master-rebranch/include/swift/AST/ParseRequests.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ class ParseAbstractFunctionBodyRequest :
7878
#undef SWIFT_TYPEID_HEADER
7979

8080
// Set up reporting of evaluated requests.
81-
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching) \
82-
template<> \
83-
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
84-
const RequestType &request) { \
85-
++stats.getFrontendCounters().RequestType; \
86-
}
81+
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching, LocOptions) \
82+
template <> \
83+
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
84+
const RequestType &request) { \
85+
++stats.getFrontendCounters().RequestType; \
86+
}
8787
#include "swift/AST/ParseTypeIDZone.def"
8888
#undef SWIFT_REQUEST
8989

‎branches/master-rebranch/include/swift/AST/ParseTypeIDZone.def

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
//===----------------------------------------------------------------------===//
1616

1717
SWIFT_REQUEST(Parse, ParseMembersRequest,
18-
ArrayRef<Decl *>(IterableDeclContext *), Cached)
18+
ArrayRef<Decl *>(IterableDeclContext *), Cached, NoLocationInfo)
1919
SWIFT_REQUEST(Parse, ParseAbstractFunctionBodyRequest,
20-
BraceStmt *(AbstractFunctionDecl *), SeparatelyCached)
20+
BraceStmt *(AbstractFunctionDecl *), SeparatelyCached,
21+
NoLocationInfo)

‎branches/master-rebranch/include/swift/AST/TypeCheckRequests.h

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ class InheritedTypeRequest :
5757
TypeResolutionStage),
5858
CacheKind::SeparatelyCached>
5959
{
60-
/// Retrieve the TypeLoc for this inherited type.
61-
TypeLoc &getTypeLoc(llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
62-
unsigned index) const;
63-
6460
public:
6561
using SimpleRequest::SimpleRequest;
6662

@@ -1183,12 +1179,12 @@ void simple_display(llvm::raw_ostream &out, const TypeRepr *TyR);
11831179
#undef SWIFT_TYPEID_HEADER
11841180

11851181
// Set up reporting of evaluated requests.
1186-
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching) \
1187-
template<> \
1188-
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
1189-
const RequestType &request) { \
1190-
++stats.getFrontendCounters().RequestType; \
1191-
}
1182+
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching, LocOptions) \
1183+
template<> \
1184+
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
1185+
const RequestType &request) { \
1186+
++stats.getFrontendCounters().RequestType; \
1187+
}
11921188
#include "swift/AST/TypeCheckerTypeIDZone.def"
11931189
#undef SWIFT_REQUEST
11941190

‎branches/master-rebranch/include/swift/AST/TypeCheckerTypeIDZone.def

Lines changed: 62 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -19,100 +19,115 @@ SWIFT_REQUEST(TypeChecker, AbstractGenericSignatureRequest,
1919
GenericSignature *(GenericSignature *,
2020
SmallVector<GenericTypeParamType *, 2>,
2121
SmallVector<Requirement, 2>),
22-
Cached)
22+
Cached, NoLocationInfo)
2323
SWIFT_REQUEST(TypeChecker, AttachedFunctionBuilderRequest,
24-
CustomAttr *(ValueDecl *), Cached)
24+
CustomAttr *(ValueDecl *), Cached, NoLocationInfo)
2525
SWIFT_REQUEST(TypeChecker, AttachedPropertyWrapperTypeRequest,
26-
Type(VarDecl *, unsigned), Cached)
26+
Type(VarDecl *, unsigned), Cached, NoLocationInfo)
2727
SWIFT_REQUEST(TypeChecker, AttachedPropertyWrappersRequest,
28-
llvm::TinyPtrVector<CustomAttr *>(VarDecl *), Cached)
28+
llvm::TinyPtrVector<CustomAttr *>(VarDecl *), Cached,
29+
NoLocationInfo)
2930
SWIFT_REQUEST(TypeChecker, ClassAncestryFlagsRequest,
30-
AncestryFlags(ClassDecl *), Cached)
31+
AncestryFlags(ClassDecl *), Cached, NoLocationInfo)
3132
SWIFT_REQUEST(TypeChecker, DefaultDefinitionTypeRequest,
32-
Type(AssociatedTypeDecl *), Cached)
33+
Type(AssociatedTypeDecl *), Cached, NoLocationInfo)
3334
SWIFT_REQUEST(TypeChecker, DefaultTypeRequest,
34-
Type(KnownProtocolKind, const DeclContext *), SeparatelyCached)
35+
Type(KnownProtocolKind, const DeclContext *), SeparatelyCached,
36+
NoLocationInfo)
3537
SWIFT_REQUEST(TypeChecker, EmittedMembersRequest, DeclRange(ClassDecl *),
36-
SeparatelyCached)
38+
SeparatelyCached, NoLocationInfo)
3739
SWIFT_REQUEST(TypeChecker, EnumRawTypeRequest,
38-
Type(EnumDecl *, TypeResolutionStage), SeparatelyCached)
40+
Type(EnumDecl *, TypeResolutionStage), SeparatelyCached,
41+
NoLocationInfo)
3942
SWIFT_REQUEST(TypeChecker, ExistentialConformsToSelfRequest,
40-
bool(ProtocolDecl *), SeparatelyCached)
43+
bool(ProtocolDecl *), SeparatelyCached, NoLocationInfo)
4144
SWIFT_REQUEST(TypeChecker, ExistentialTypeSupportedRequest,
42-
bool(ProtocolDecl *), SeparatelyCached)
43-
SWIFT_REQUEST(TypeChecker, ExtendedTypeRequest, Type(ExtensionDecl *), Cached)
45+
bool(ProtocolDecl *), SeparatelyCached, NoLocationInfo)
46+
SWIFT_REQUEST(TypeChecker, ExtendedTypeRequest, Type(ExtensionDecl *), Cached,
47+
NoLocationInfo)
4448
SWIFT_REQUEST(TypeChecker, FunctionBuilderTypeRequest, Type(ValueDecl *),
45-
Cached)
49+
Cached, NoLocationInfo)
4650
SWIFT_REQUEST(TypeChecker, FunctionOperatorRequest, OperatorDecl *(FuncDecl *),
47-
Cached)
51+
Cached, NoLocationInfo)
4852
SWIFT_REQUEST(TypeChecker, InferredGenericSignatureRequest,
4953
GenericSignature *(ModuleDecl *, GenericSignature *,
5054
SmallVector<GenericParamList *, 2>,
5155
SmallVector<Requirement, 2>,
5256
SmallVector<TypeLoc, 2>, bool),
53-
Cached)
57+
Cached, NoLocationInfo)
5458
SWIFT_REQUEST(TypeChecker, InheritedTypeRequest,
5559
Type(llvm::PointerUnion<TypeDecl *, ExtensionDecl *>, unsigned,
5660
TypeResolutionStage),
57-
SeparatelyCached)
61+
SeparatelyCached, HasNearestLocation)
5862
SWIFT_REQUEST(TypeChecker, InitKindRequest,
59-
CtorInitializerKind(ConstructorDecl *), Cached)
63+
CtorInitializerKind(ConstructorDecl *), Cached, NoLocationInfo)
6064
SWIFT_REQUEST(TypeChecker, IsAccessorTransparentRequest, bool(AccessorDecl *),
61-
SeparatelyCached)
65+
SeparatelyCached, NoLocationInfo)
6266
SWIFT_REQUEST(TypeChecker, IsDynamicRequest, bool(ValueDecl *),
63-
SeparatelyCached)
64-
SWIFT_REQUEST(TypeChecker, IsFinalRequest, bool(ValueDecl *), SeparatelyCached)
67+
SeparatelyCached, NoLocationInfo)
68+
SWIFT_REQUEST(TypeChecker, IsFinalRequest, bool(ValueDecl *), SeparatelyCached,
69+
NoLocationInfo)
6570
SWIFT_REQUEST(TypeChecker, IsGetterMutatingRequest, bool(AbstractStorageDecl *),
66-
SeparatelyCached)
71+
SeparatelyCached, NoLocationInfo)
6772
SWIFT_REQUEST(TypeChecker, IsImplicitlyUnwrappedOptionalRequest,
68-
bool(ValueDecl *), SeparatelyCached)
69-
SWIFT_REQUEST(TypeChecker, IsObjCRequest, bool(ValueDecl *), SeparatelyCached)
73+
bool(ValueDecl *), SeparatelyCached, NoLocationInfo)
74+
SWIFT_REQUEST(TypeChecker, IsObjCRequest, bool(ValueDecl *), SeparatelyCached,
75+
NoLocationInfo)
7076
SWIFT_REQUEST(TypeChecker, IsSetterMutatingRequest, bool(AbstractStorageDecl *),
71-
SeparatelyCached)
77+
SeparatelyCached, NoLocationInfo)
7278
SWIFT_REQUEST(TypeChecker, LazyStoragePropertyRequest, VarDecl *(VarDecl *),
73-
Cached)
79+
Cached, NoLocationInfo)
7480
SWIFT_REQUEST(TypeChecker, MangleLocalTypeDeclRequest,
75-
std::string(const TypeDecl *), Cached)
81+
std::string(const TypeDecl *), Cached, NoLocationInfo)
7682
SWIFT_REQUEST(TypeChecker, OpaqueReadOwnershipRequest,
77-
OpaqueReadOwnership(AbstractStorageDecl *), SeparatelyCached)
83+
OpaqueReadOwnership(AbstractStorageDecl *), SeparatelyCached,
84+
NoLocationInfo)
7885
SWIFT_REQUEST(TypeChecker, OverriddenDeclsRequest,
79-
llvm::TinyPtrVector<ValueDecl *>(ValueDecl *), SeparatelyCached)
86+
llvm::TinyPtrVector<ValueDecl *>(ValueDecl *), SeparatelyCached,
87+
NoLocationInfo)
8088
SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyInfoRequest,
81-
PropertyWrapperBackingPropertyInfo(VarDecl *), Cached)
89+
PropertyWrapperBackingPropertyInfo(VarDecl *), Cached,
90+
NoLocationInfo)
8291
SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyTypeRequest,
83-
Type(VarDecl *), Cached)
92+
Type(VarDecl *), Cached, NoLocationInfo)
8493
SWIFT_REQUEST(TypeChecker, PropertyWrapperMutabilityRequest,
85-
Optional<PropertyWrapperMutability>(VarDecl *), Cached)
94+
Optional<PropertyWrapperMutability>(VarDecl *), Cached,
95+
NoLocationInfo)
8696
SWIFT_REQUEST(TypeChecker, PropertyWrapperTypeInfoRequest,
87-
PropertyWrapperTypeInfo(NominalTypeDecl *), Cached)
97+
PropertyWrapperTypeInfo(NominalTypeDecl *), Cached,
98+
NoLocationInfo)
8899
SWIFT_REQUEST(TypeChecker, ProtocolRequiresClassRequest, bool(ProtocolDecl *),
89-
SeparatelyCached)
100+
SeparatelyCached, NoLocationInfo)
90101
SWIFT_REQUEST(TypeChecker, RequirementRequest,
91102
Requirement(WhereClauseOwner, unsigned, TypeResolutionStage),
92-
SeparatelyCached)
103+
SeparatelyCached, HasNearestLocation)
93104
SWIFT_REQUEST(TypeChecker, RequirementSignatureRequest,
94-
ArrayRef<Requirement>(ProtocolDecl *), SeparatelyCached)
105+
ArrayRef<Requirement>(ProtocolDecl *), SeparatelyCached,
106+
NoLocationInfo)
95107
SWIFT_REQUEST(TypeChecker, RequiresOpaqueAccessorsRequest, bool(VarDecl *),
96-
SeparatelyCached)
108+
SeparatelyCached, NoLocationInfo)
97109
SWIFT_REQUEST(TypeChecker, RequiresOpaqueModifyCoroutineRequest,
98-
bool(AbstractStorageDecl *), SeparatelyCached)
110+
bool(AbstractStorageDecl *), SeparatelyCached, NoLocationInfo)
99111
SWIFT_REQUEST(TypeChecker, ResilienceExpansionRequest,
100-
ResilienceExpansion(DeclContext *), Cached)
112+
ResilienceExpansion(DeclContext *), Cached, NoLocationInfo)
101113
SWIFT_REQUEST(TypeChecker, SelfAccessKindRequest, SelfAccessKind(FuncDecl *),
102-
SeparatelyCached)
114+
SeparatelyCached, NoLocationInfo)
103115
SWIFT_REQUEST(TypeChecker, StorageImplInfoRequest,
104-
StorageImplInfo(AbstractStorageDecl *), SeparatelyCached)
116+
StorageImplInfo(AbstractStorageDecl *), SeparatelyCached,
117+
NoLocationInfo)
105118
SWIFT_REQUEST(TypeChecker, StoredPropertiesAndMissingMembersRequest,
106-
ArrayRef<Decl *>(NominalTypeDecl *), Cached)
119+
ArrayRef<Decl *>(NominalTypeDecl *), Cached, NoLocationInfo)
107120
SWIFT_REQUEST(TypeChecker, StoredPropertiesRequest,
108-
ArrayRef<VarDecl *>(NominalTypeDecl *), Cached)
109-
SWIFT_REQUEST(TypeChecker, StructuralTypeRequest, Type(TypeAliasDecl *), Cached)
121+
ArrayRef<VarDecl *>(NominalTypeDecl *), Cached, NoLocationInfo)
122+
SWIFT_REQUEST(TypeChecker, StructuralTypeRequest, Type(TypeAliasDecl *), Cached,
123+
NoLocationInfo)
110124
SWIFT_REQUEST(TypeChecker, SuperclassTypeRequest,
111-
Type(NominalTypeDecl *, TypeResolutionStage), SeparatelyCached)
125+
Type(NominalTypeDecl *, TypeResolutionStage), SeparatelyCached,
126+
NoLocationInfo)
112127
SWIFT_REQUEST(TypeChecker, SynthesizeAccessorRequest,
113128
AccessorDecl *(AbstractStorageDecl *, AccessorKind),
114-
SeparatelyCached)
129+
SeparatelyCached, NoLocationInfo)
115130
SWIFT_REQUEST(TypeChecker, TypeCheckFunctionBodyUntilRequest,
116-
bool(AbstractFunctionDecl *, SourceLoc), Cached)
131+
bool(AbstractFunctionDecl *, SourceLoc), Cached, NoLocationInfo)
117132
SWIFT_REQUEST(TypeChecker, USRGenerationRequest, std::string(const ValueDecl *),
118-
Cached)
133+
Cached, NoLocationInfo)

‎branches/master-rebranch/include/swift/Basic/DefineTypeIDZone.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
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, Sig, Caching) SWIFT_TYPEID_NAMED(Type, Type)
36+
#define SWIFT_REQUEST(Zone, Type, Sig, Caching, LocOptions) SWIFT_TYPEID_NAMED(Type, Type)
3737

3838
// First pass: put all of the names into an enum so we get values for them.
3939
template<> struct TypeIDZoneTypes<Zone::SWIFT_TYPEID_ZONE> {

‎branches/master-rebranch/include/swift/Basic/ImplementTypeIDZone.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +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, Sig, Caching) SWIFT_TYPEID_NAMED(Type, Type)
36+
#define SWIFT_REQUEST(Zone, Type, Sig, Caching, LocOptions) SWIFT_TYPEID_NAMED(Type, Type)
3737
#define SWIFT_TYPEID(Type) SWIFT_TYPEID_NAMED(Type, Type)
3838

3939
// Out-of-line definitions.

0 commit comments

Comments
 (0)