Skip to content

Commit 4ee6e4a

Browse files
nkcsgexinkcsgexi
committed
---
yaml --- r: 343545 b: refs/heads/master-rebranch c: c2cce35 h: refs/heads/master i: 343543: 997d36e
1 parent e533936 commit 4ee6e4a

File tree

112 files changed

+826
-944
lines changed

Some content is hidden

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

112 files changed

+826
-944
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: 86c0bcc4a5508059267e8476031da1e95ca453ba
1458+
refs/heads/master-rebranch: c2cce35da34448877c1bae4c233cd7a4a5e16f58
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/ASTNode.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ namespace swift {
3636
enum class DeclKind : uint8_t;
3737
enum class StmtKind;
3838

39-
struct ASTNode : public llvm::PointerUnion<Expr*, Stmt*, Decl*> {
39+
struct ASTNode : public llvm::PointerUnion3<Expr*, Stmt*, Decl*> {
4040
// Inherit the constructors from PointerUnion.
41-
using PointerUnion::PointerUnion;
42-
41+
using PointerUnion3::PointerUnion3;
42+
4343
SourceRange getSourceRange() const;
4444

4545
/// Return the location of the start of the statement.

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,14 @@ class SetterAccessLevelRequest :
7575
void cacheResult(AccessLevel value) const;
7676
};
7777

78-
using DefaultAndMax = std::pair<AccessLevel, AccessLevel>;
79-
8078
/// Request the Default and Max AccessLevels of the given ExtensionDecl.
8179
class DefaultAndMaxAccessLevelRequest :
8280
public SimpleRequest<DefaultAndMaxAccessLevelRequest,
83-
DefaultAndMax(ExtensionDecl *),
81+
std::pair<AccessLevel, AccessLevel>(ExtensionDecl *),
8482
CacheKind::SeparatelyCached> {
8583
public:
8684
using SimpleRequest::SimpleRequest;
85+
using DefaultAndMax = std::pair<AccessLevel, AccessLevel>;
8786
private:
8887
friend SimpleRequest;
8988

@@ -105,7 +104,7 @@ class DefaultAndMaxAccessLevelRequest :
105104
#undef SWIFT_TYPEID_HEADER
106105

107106
// Set up reporting of evaluated requests.
108-
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching) \
107+
#define SWIFT_REQUEST(Zone, RequestType) \
109108
template<> \
110109
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
111110
const RequestType &request) { \

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

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

18-
SWIFT_REQUEST(AccessControl, AccessLevelRequest, AccessLevel(ValueDecl *),
19-
SeparatelyCached)
20-
SWIFT_REQUEST(AccessControl, DefaultAndMaxAccessLevelRequest,
21-
DefaultAndMax(ExtensionDecl *), SeparatelyCached)
22-
SWIFT_REQUEST(AccessControl, SetterAccessLevelRequest,
23-
AccessLevel(AbstractStorageDecl *), SeparatelyCached)
18+
SWIFT_REQUEST(AccessControl, AccessLevelRequest)
19+
SWIFT_REQUEST(AccessControl, DefaultAndMaxAccessLevelRequest)
20+
SWIFT_REQUEST(AccessControl, SetterAccessLevelRequest)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4789,7 +4789,7 @@ class VarDecl : public AbstractStorageDecl {
47894789
};
47904790

47914791
protected:
4792-
PointerUnion<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
4792+
PointerUnion3<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
47934793

47944794
VarDecl(DeclKind kind, bool isStatic, Introducer introducer,
47954795
bool issCaptureList, SourceLoc nameLoc, Identifier name,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ WARNING(implicit_bridging_header_imported_from_module,none,
9191
"is deprecated and will be removed in a later version of Swift",
9292
(StringRef, Identifier))
9393

94+
WARNING(clang_vfs_overlay_is_ignored,none,
95+
"ignoring '-ivfsoverlay' options provided to '-Xcc' in favor of "
96+
"'-vfsoverlay'", ())
97+
9498
#ifndef DIAG_NO_UNDEF
9599
# if defined(DIAG)
96100
# undef DIAG

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ class GenericSignatureBuilder {
9292
class ResolvedType;
9393

9494
using UnresolvedRequirementRHS =
95-
llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
95+
llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
9696

9797
using RequirementRHS =
98-
llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
98+
llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
9999

100100
/// The location of a requirement as written somewhere in the source.
101101
typedef llvm::PointerUnion<const TypeRepr *, const RequirementRepr *>
@@ -1373,8 +1373,8 @@ class GenericSignatureBuilder::FloatingRequirementSource {
13731373
} kind;
13741374

13751375
using Storage =
1376-
llvm::PointerUnion<const RequirementSource *, const TypeRepr *,
1377-
const RequirementRepr *>;
1376+
llvm::PointerUnion3<const RequirementSource *, const TypeRepr *,
1377+
const RequirementRepr *>;
13781378

13791379
Storage storage;
13801380

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
#include "llvm/ADT/SmallSet.h"
2525
#include "llvm/ADT/TinyPtrVector.h"
2626

27-
namespace llvm {
28-
class FileCollector;
29-
}
30-
3127
namespace clang {
3228
class DependencyCollector;
3329
}
@@ -58,9 +54,8 @@ enum class Bridgeability : unsigned {
5854
class DependencyTracker {
5955
std::shared_ptr<clang::DependencyCollector> clangCollector;
6056
public:
61-
explicit DependencyTracker(
62-
bool TrackSystemDeps,
63-
std::shared_ptr<llvm::FileCollector> FileCollector = {});
57+
58+
explicit DependencyTracker(bool TrackSystemDeps);
6459

6560
/// Adds a file as a dependency.
6661
///

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ template<typename Request>
265265
void reportEvaluatedRequest(UnifiedStatsReporter &stats,
266266
const Request &request);
267267

268-
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching) \
268+
#define SWIFT_REQUEST(Zone, RequestType) \
269269
template<> \
270270
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
271271
const RequestType &request) { \

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

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,12 @@
1515
//
1616
//===----------------------------------------------------------------------===//
1717

18-
SWIFT_REQUEST(NameLookup, CustomAttrNominalRequest,
19-
NominalTypeDecl *(CustomAttr *, DeclContext *), Cached)
20-
SWIFT_REQUEST(NameLookup, ExtendedNominalRequest,
21-
NominalTypeDecl *(ExtensionDecl *), SeparatelyCached)
22-
SWIFT_REQUEST(NameLookup, GetDestructorRequest, DestructorDecl *(ClassDecl *),
23-
SeparatelyCached)
24-
SWIFT_REQUEST(NameLookup, InheritedDeclsReferencedRequest,
25-
DirectlyReferencedTypeDecls(
26-
llvm::PointerUnion<TypeDecl *, ExtensionDecl *>, unsigned),
27-
Uncached)
28-
SWIFT_REQUEST(NameLookup, SelfBoundsFromWhereClauseRequest,
29-
SelfBounds(llvm::PointerUnion<TypeDecl *, ExtensionDecl *>),
30-
Uncached)
31-
SWIFT_REQUEST(NameLookup, SuperclassDeclRequest, ClassDecl *(NominalTypeDecl *),
32-
SeparatelyCached)
33-
SWIFT_REQUEST(NameLookup, TypeDeclsFromWhereClauseRequest,
34-
DirectlyReferencedTypeDecls(ExtensionDecl *), Uncached)
35-
SWIFT_REQUEST(NameLookup, UnderlyingTypeDeclsReferencedRequest,
36-
DirectlyReferencedTypeDecls(TypeAliasDecl *), Uncached)
18+
SWIFT_REQUEST(NameLookup, CustomAttrNominalRequest)
19+
SWIFT_REQUEST(NameLookup, ExtendedNominalRequest)
20+
SWIFT_REQUEST(NameLookup, GetDestructorRequest)
21+
SWIFT_REQUEST(NameLookup, InheritedDeclsReferencedRequest)
22+
SWIFT_REQUEST(NameLookup, SelfBoundsFromWhereClauseRequest)
23+
SWIFT_REQUEST(NameLookup, SuperclassDeclRequest)
24+
SWIFT_REQUEST(NameLookup, TypeDeclsFromWhereClauseRequest)
25+
SWIFT_REQUEST(NameLookup, UnderlyingTypeDeclsReferencedRequest)
26+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class ParseAbstractFunctionBodyRequest :
7878
#undef SWIFT_TYPEID_HEADER
7979

8080
// Set up reporting of evaluated requests.
81-
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching) \
81+
#define SWIFT_REQUEST(Zone, RequestType) \
8282
template<> \
8383
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
8484
const RequestType &request) { \

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
SWIFT_REQUEST(Parse, ParseMembersRequest,
18-
ArrayRef<Decl *>(IterableDeclContext *), Cached)
19-
SWIFT_REQUEST(Parse, ParseAbstractFunctionBodyRequest,
20-
BraceStmt *(AbstractFunctionDecl *), SeparatelyCached)
17+
SWIFT_REQUEST(Parse, ParseMembersRequest)
18+
SWIFT_REQUEST(Parse, ParseAbstractFunctionBodyRequest)

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,10 @@ class EnumRawTypeRequest :
138138

139139
/// Request to determine the set of declarations that were are overridden
140140
/// by the given declaration.
141-
class OverriddenDeclsRequest :
142-
public SimpleRequest<OverriddenDeclsRequest,
143-
llvm::TinyPtrVector<ValueDecl *>(ValueDecl *),
144-
CacheKind::SeparatelyCached> {
141+
class OverriddenDeclsRequest
142+
: public SimpleRequest<OverriddenDeclsRequest,
143+
llvm::TinyPtrVector<ValueDecl *>(ValueDecl *),
144+
CacheKind::SeparatelyCached> {
145145
public:
146146
using SimpleRequest::SimpleRequest;
147147

@@ -183,7 +183,7 @@ class IsObjCRequest :
183183
void simple_display(llvm::raw_ostream &out, CtorInitializerKind initKind);
184184

185185
/// Computes the kind of initializer for a given \c ConstructorDecl
186-
class InitKindRequest :
186+
class InitKindRequest:
187187
public SimpleRequest<InitKindRequest,
188188
CtorInitializerKind(ConstructorDecl *),
189189
CacheKind::Cached> {
@@ -203,7 +203,7 @@ class InitKindRequest :
203203
};
204204

205205
/// Determine whether the given protocol declaration is class-bounded.
206-
class ProtocolRequiresClassRequest :
206+
class ProtocolRequiresClassRequest:
207207
public SimpleRequest<ProtocolRequiresClassRequest,
208208
bool(ProtocolDecl *),
209209
CacheKind::SeparatelyCached> {
@@ -229,7 +229,7 @@ class ProtocolRequiresClassRequest :
229229

230230
/// Determine whether an existential conforming to a protocol can be matched
231231
/// with a generic type parameter constrained to that protocol.
232-
class ExistentialConformsToSelfRequest :
232+
class ExistentialConformsToSelfRequest:
233233
public SimpleRequest<ExistentialConformsToSelfRequest,
234234
bool(ProtocolDecl *),
235235
CacheKind::SeparatelyCached> {
@@ -255,7 +255,7 @@ class ExistentialConformsToSelfRequest :
255255

256256
/// Determine whether we are allowed to refer to an existential type conforming
257257
/// to this protocol.
258-
class ExistentialTypeSupportedRequest :
258+
class ExistentialTypeSupportedRequest:
259259
public SimpleRequest<ExistentialTypeSupportedRequest,
260260
bool(ProtocolDecl *),
261261
CacheKind::SeparatelyCached> {
@@ -369,7 +369,7 @@ struct WhereClauseOwner {
369369

370370
/// The source of the where clause, which can be a generic parameter list
371371
/// or a declaration that can have a where clause.
372-
llvm::PointerUnion<GenericParamList *, Decl *, SpecializeAttr *> source;
372+
llvm::PointerUnion3<GenericParamList *, Decl *, SpecializeAttr *> source;
373373

374374
WhereClauseOwner(Decl *decl);
375375

@@ -1195,7 +1195,7 @@ void simple_display(llvm::raw_ostream &out, const TypeRepr *TyR);
11951195
#undef SWIFT_TYPEID_HEADER
11961196

11971197
// Set up reporting of evaluated requests.
1198-
#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching) \
1198+
#define SWIFT_REQUEST(Zone, RequestType) \
11991199
template<> \
12001200
inline void reportEvaluatedRequest(UnifiedStatsReporter &stats, \
12011201
const RequestType &request) { \

0 commit comments

Comments
 (0)