Skip to content

Commit f2282ef

Browse files
theblixguytheblixguy
committed
---
yaml --- r: 343548 b: refs/heads/master-rebranch c: ab11842 h: refs/heads/master
1 parent 989f9d6 commit f2282ef

File tree

270 files changed

+2808
-3511
lines changed

Some content is hidden

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

270 files changed

+2808
-3511
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: 4d4f7641a3c370070d56342d7d51955b4c327a8a
1458+
refs/heads/master-rebranch: ab1184208a1fee3637ad97e0d3c4175606071ddd
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/CHANGELOG.md

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,6 @@ CHANGELOG
2626
Swift Next
2727
----------
2828

29-
* [SE-0253][]:
30-
31-
Values of types that declare `func callAsFunction` methods can be called
32-
like functions. The call syntax is shorthand for applying
33-
`func callAsFunction` methods.
34-
35-
```swift
36-
struct Adder {
37-
var base: Int
38-
func callAsFunction(_ x: Int) -> Int {
39-
return x + base
40-
}
41-
}
42-
var adder = Adder(base: 3)
43-
adder(10) // returns 13, same as `adder.callAsFunction(10)`
44-
```
45-
46-
* `func callAsFunction` argument labels are required at call sites.
47-
* Multiple `func callAsFunction` methods on a single type are supported.
48-
* `mutating func callAsFunction` is supported.
49-
* `func callAsFunction` works with `throws` and `rethrows`.
50-
* `func callAsFunction` works with trailing closures.
51-
5229
* [SR-4206][]:
5330

5431
A method override is no longer allowed to have a generic signature with
@@ -7734,7 +7711,6 @@ Swift 1.0
77347711
[SE-0244]: <https://github.com/apple/swift-evolution/blob/master/proposals/0244-opaque-result-types.md>
77357712
[SE-0245]: <https://github.com/apple/swift-evolution/blob/master/proposals/0245-array-uninitialized-initializer.md>
77367713
[SE-0252]: <https://github.com/apple/swift-evolution/blob/master/proposals/0252-keypath-dynamic-member-lookup.md>
7737-
[SE-0253]: <https://github.com/apple/swift-evolution/blob/master/proposals/0253-callable.md>
77387714
[SE-0254]: <https://github.com/apple/swift-evolution/blob/master/proposals/0254-static-subscripts.md>
77397715

77407716
[SR-106]: <https://bugs.swift.org/browse/SR-106>

‎branches/master-rebranch/docs/ABI/Mangling.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -551,11 +551,6 @@ Types
551551
type ::= assoc-type-name 'Qz' // shortcut for 'Qyz'
552552
type ::= assoc-type-list 'QY' GENERIC-PARAM-INDEX // associated type at depth
553553
type ::= assoc-type-list 'QZ' // shortcut for 'QYz'
554-
555-
#if SWIFT_RUNTIME_VERSION >= 5.2
556-
type ::= type assoc-type-name 'Qx' // associated type relative to base `type`
557-
type ::= type assoc-type-list 'QX' // associated type relative to base `type`
558-
#endif
559554

560555
protocol-list ::= protocol '_' protocol*
561556
protocol-list ::= empty-list

‎branches/master-rebranch/docs/CToSwiftNameTranslation.md

Lines changed: 0 additions & 193 deletions
This file was deleted.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#ifndef SWIFT_AST_ASTCONTEXT_H
1818
#define SWIFT_AST_ASTCONTEXT_H
1919

20+
#include "swift/AST/ClangModuleLoader.h"
2021
#include "swift/AST/Evaluator.h"
2122
#include "swift/AST/GenericSignature.h"
2223
#include "swift/AST/Identifier.h"
@@ -31,7 +32,6 @@
3132
#include "llvm/ADT/MapVector.h"
3233
#include "llvm/ADT/PointerIntPair.h"
3334
#include "llvm/ADT/SetVector.h"
34-
#include "llvm/ADT/SmallPtrSet.h"
3535
#include "llvm/ADT/StringMap.h"
3636
#include "llvm/ADT/TinyPtrVector.h"
3737
#include "llvm/Support/Allocator.h"
@@ -49,12 +49,10 @@ namespace clang {
4949
}
5050

5151
namespace swift {
52-
class AbstractFunctionDecl;
5352
class ASTContext;
5453
enum class Associativity : unsigned char;
5554
class AvailabilityContext;
5655
class BoundGenericType;
57-
class ClangModuleLoader;
5856
class ClangNode;
5957
class ConcreteDeclRef;
6058
class ConstructorDecl;

‎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/ASTTypeIDZone.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)
1919
SWIFT_TYPEID_NAMED(ValueDecl *, ValueDecl)
2020
SWIFT_TYPEID_NAMED(ProtocolDecl *, ProtocolDecl)
2121
SWIFT_TYPEID_NAMED(Decl *, Decl)
22-
SWIFT_TYPEID_NAMED(ModuleDecl *, ModuleDecl)
2322
SWIFT_TYPEID(Type)
2423
SWIFT_TYPEID(TypePair)
2524
SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class Decl;
2626
class GenericSignature;
2727
class GenericTypeParamType;
2828
class IterableDeclContext;
29-
class ModuleDecl;
3029
class NominalTypeDecl;
3130
class OperatorDecl;
3231
struct PropertyWrapperBackingPropertyInfo;

‎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)

0 commit comments

Comments
 (0)