Skip to content

Commit 3a78e3f

Browse files
author
David Ungar
committed
---
yaml --- r: 349284 b: refs/heads/master-next c: 8ca0f0d h: refs/heads/master
1 parent 55b0b82 commit 3a78e3f

File tree

353 files changed

+4093
-10107
lines changed

Some content is hidden

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

353 files changed

+4093
-10107
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
3-
refs/heads/master-next: 111c8929a5f3c57bb24898258114f2c4439bd77e
3+
refs/heads/master-next: 8ca0f0dc33fffe85395b30f269aa23a1d11c0fc6
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

‎branches/master-next/CHANGELOG.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Swift Next
8181
mutableSelf.someProperty = newValue // Okay
8282
}
8383
}
84-
```
84+
```
8585

8686
* [SE-0253][]:
8787

@@ -145,8 +145,6 @@ Swift Next
145145
Swift 5.1
146146
---------
147147

148-
### 2019-09-20 (Xcode 11.0)
149-
150148
* [SR-8974][]:
151149

152150
Duplicate tuple element labels are no longer allowed, because it leads

‎branches/master-next/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,6 @@ if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
996996
-DCMAKE_CXX_COMPILER=${SWIFT_LIBDISPATCH_CXX_COMPILER}
997997
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
998998
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
999-
-DCMAKE_INSTALL_LIBDIR=lib
1000999
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
10011000
-DCMAKE_LINKER=${CMAKE_LINKER}
10021001
-DCMAKE_RANLIB=${CMAKE_RANLIB}

‎branches/master-next/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
|**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/aarch64_ubuntu_16.04.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64)|
1919
|**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | ARMv7 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android)|
2020
|**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64)|
21+
|**[Debian 9.5](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_debian_9.5.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5)|
2122
|**[Windows 2019](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_windows_2019.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-windows-x86_64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-windows-x86_64)|
2223

2324
**Swift TensorFlow Community-Hosted CI Platforms**

‎branches/master-next/cmake/modules/SwiftHandleGybSources.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
118118
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AttributeNodes.py"
119119
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AvailabilityNodes.py"
120120
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/CommonNodes.py"
121-
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/CompletionOnlyNodes.py"
122121
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/DeclNodes.py"
123122
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/ExprNodes.py"
124123
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/GenericNodes.py"

‎branches/master-next/cmake/modules/SwiftSource.cmake

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,9 @@ function(_compile_swift_files
310310
set(module_base "${module_dir}/${SWIFTFILE_MODULE_NAME}")
311311
if(SWIFTFILE_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
312312
set(specific_module_dir "${module_base}.swiftmodule")
313-
set(specific_module_private_dir "${specific_module_dir}/Private")
314-
set(source_info_file "${specific_module_private_dir}/${SWIFTFILE_ARCHITECTURE}.swiftsourceinfo")
315313
set(module_base "${module_base}.swiftmodule/${SWIFTFILE_ARCHITECTURE}")
316314
else()
317315
set(specific_module_dir)
318-
set(specific_module_private_dir)
319-
set(source_info_file "${module_base}.swiftsourceinfo")
320316
endif()
321317
set(module_file "${module_base}.swiftmodule")
322318
set(module_doc_file "${module_base}.swiftdoc")
@@ -353,8 +349,7 @@ function(_compile_swift_files
353349
swift_install_in_component(DIRECTORY "${specific_module_dir}"
354350
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${library_subdir}"
355351
COMPONENT "${SWIFTFILE_INSTALL_IN_COMPONENT}"
356-
OPTIONAL
357-
PATTERN "Private" EXCLUDE)
352+
OPTIONAL)
358353
else()
359354
swift_install_in_component(FILES ${module_outputs}
360355
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${library_subdir}"
@@ -495,11 +490,9 @@ function(_compile_swift_files
495490
COMMAND
496491
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir}
497492
${specific_module_dir}
498-
${specific_module_private_dir}
499493
COMMAND
500494
"${PYTHON_EXECUTABLE}" "${line_directive_tool}" "@${file_path}" --
501495
"${swift_compiler_tool}" "-emit-module" "-o" "${module_file}"
502-
"-emit-module-source-info-path" "${source_info_file}"
503496
${swift_flags} ${swift_module_flags} "@${file_path}"
504497
${command_touch_module_outputs}
505498
OUTPUT ${module_outputs}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ Entities
290290
entity-spec ::= type 'fu' INDEX // implicit anonymous closure
291291
entity-spec ::= 'fA' INDEX // default argument N+1 generator
292292
entity-spec ::= 'fi' // non-local variable initializer
293-
entity-spec ::= 'fP' // property wrapper backing initializer
294293
entity-spec ::= 'fD' // deallocating destructor; untyped
295294
entity-spec ::= 'fd' // non-deallocating destructor; untyped
296295
entity-spec ::= 'fE' // ivar destroyer; untyped
@@ -481,7 +480,7 @@ Types
481480
type ::= 'Bf' NATURAL '_' // Builtin.Float<n>
482481
type ::= 'Bi' NATURAL '_' // Builtin.Int<n>
483482
type ::= 'BI' // Builtin.IntLiteral
484-
type ::= 'BO' // Builtin.UnknownObject (no longer a distinct type, but still used for AnyObject)
483+
type ::= 'BO' // Builtin.UnknownObject
485484
type ::= 'Bo' // Builtin.NativeObject
486485
type ::= 'Bp' // Builtin.RawPointer
487486
type ::= 'Bt' // Builtin.SILToken

‎branches/master-next/docs/ARCOptimization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ is_unique performs depends on the argument type:
335335

336336
- Objective-C object types require an additional check that the
337337
dynamic object type uses native Swift reference counting:
338-
(unknown class reference, class existential)
338+
(Builtin.UnknownObject, unknown class reference, class existential)
339339

340340
- Bridged object types allow the dynamic object type check to be
341341
bypassed based on the pointer encoding:

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,19 @@ extension Counter {
370370
}
371371
```
372372

373+
The getter/setter syntax also allows for subscripts by using the base name `subscript`.
374+
375+
```objc
376+
__attribute__((swift_name("getter:LinkedListOfInts.subscript(self:_:)")))
377+
int LinkedListGetAtIndex(const LinkedListOfInts *head, int index);
378+
```
379+
380+
```swift
381+
extension LinkedListOfInts {
382+
subscript(_ index: Int32) -> Int32 { get }
383+
}
384+
```
385+
373386
Finally, functions can be imported as initializers as well by using the base name `init`. These are considered "factory" initializers and are never inherited or overridable. They must not have a `self` parameter.
374387

375388
```objc

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,7 @@ class ASTContext final {
605605
const CanType TheAnyType; /// This is 'Any', the empty protocol composition
606606
const CanType TheNativeObjectType; /// Builtin.NativeObject
607607
const CanType TheBridgeObjectType; /// Builtin.BridgeObject
608+
const CanType TheUnknownObjectType; /// Builtin.UnknownObject
608609
const CanType TheRawPointerType; /// Builtin.RawPointer
609610
const CanType TheUnsafeValueBufferType; /// Builtin.UnsafeValueBuffer
610611
const CanType TheSILTokenType; /// Builtin.SILToken

‎branches/master-next/include/swift/AST/ASTMangler.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ class ASTMangler : public Mangler {
124124
SymbolKind SKind);
125125

126126
std::string mangleInitializerEntity(const VarDecl *var, SymbolKind SKind);
127-
std::string mangleBackingInitializerEntity(const VarDecl *var,
128-
SymbolKind SKind);
129127

130128
std::string mangleNominalType(const NominalTypeDecl *decl);
131129

@@ -313,7 +311,6 @@ class ASTMangler : public Mangler {
313311
void appendDefaultArgumentEntity(const DeclContext *ctx, unsigned index);
314312

315313
void appendInitializerEntity(const VarDecl *var);
316-
void appendBackingInitializerEntity(const VarDecl *var);
317314

318315
CanType getDeclTypeForMangling(const ValueDecl *decl,
319316
GenericSignature *&genericSig,

‎branches/master-next/include/swift/AST/ASTTypeIDZone.def

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,25 @@
1414
// for use with the TypeID template.
1515
//
1616
//===----------------------------------------------------------------------===//
17-
18-
SWIFT_TYPEID(AncestryFlags)
19-
SWIFT_TYPEID(CtorInitializerKind)
17+
SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
18+
SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)
19+
SWIFT_TYPEID_NAMED(ValueDecl *, ValueDecl)
20+
SWIFT_TYPEID_NAMED(ProtocolDecl *, ProtocolDecl)
21+
SWIFT_TYPEID_NAMED(Decl *, Decl)
22+
SWIFT_TYPEID_NAMED(ModuleDecl *, ModuleDecl)
23+
SWIFT_TYPEID(Type)
24+
SWIFT_TYPEID(TypePair)
2025
SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)
2126
SWIFT_TYPEID(PropertyWrapperTypeInfo)
22-
SWIFT_TYPEID(Requirement)
27+
SWIFT_TYPEID(CtorInitializerKind)
2328
SWIFT_TYPEID(ResilienceExpansion)
24-
SWIFT_TYPEID(Type)
25-
SWIFT_TYPEID(TypePair)
29+
SWIFT_TYPEID_NAMED(Optional<PropertyWrapperMutability>, PropertyWrapperMutability)
2630
SWIFT_TYPEID_NAMED(CustomAttr *, CustomAttr)
27-
SWIFT_TYPEID_NAMED(Decl *, Decl)
28-
SWIFT_TYPEID_NAMED(GenericParamList *, GenericParamList)
31+
SWIFT_TYPEID_NAMED(OperatorDecl *, OperatorDecl)
32+
SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)
33+
SWIFT_TYPEID(AncestryFlags)
2934
SWIFT_TYPEID_NAMED(GenericSignature *, GenericSignature)
3035
SWIFT_TYPEID_NAMED(GenericTypeParamType *, GenericTypeParamType)
31-
SWIFT_TYPEID_NAMED(InfixOperatorDecl *, InfixOperatorDecl)
36+
SWIFT_TYPEID(Requirement)
3237
SWIFT_TYPEID_NAMED(IterableDeclContext *, IterableDeclContext)
33-
SWIFT_TYPEID_NAMED(ModuleDecl *, ModuleDecl)
34-
SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
35-
SWIFT_TYPEID_NAMED(OperatorDecl *, OperatorDecl)
36-
SWIFT_TYPEID_NAMED(Optional<PropertyWrapperMutability>,
37-
PropertyWrapperMutability)
38-
SWIFT_TYPEID_NAMED(PrecedenceGroupDecl *, PrecedenceGroupDecl)
39-
SWIFT_TYPEID_NAMED(ProtocolDecl *, ProtocolDecl)
40-
SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)
41-
SWIFT_TYPEID_NAMED(ValueDecl *, ValueDecl)
42-
SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)
38+
SWIFT_TYPEID_NAMED(GenericParamList *, GenericParamList)

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,15 @@
2121
#include "swift/Basic/TypeID.h"
2222
namespace swift {
2323

24-
class AbstractFunctionDecl;
25-
class BraceStmt;
2624
class CustomAttr;
2725
class Decl;
2826
class GenericParamList;
2927
class GenericSignature;
3028
class GenericTypeParamType;
31-
class InfixOperatorDecl;
3229
class IterableDeclContext;
3330
class ModuleDecl;
3431
class NominalTypeDecl;
3532
class OperatorDecl;
36-
class PrecedenceGroupDecl;
3733
struct PropertyWrapperBackingPropertyInfo;
3834
struct PropertyWrapperTypeInfo;
3935
enum class CtorInitializerKind;

0 commit comments

Comments
 (0)