Skip to content

Commit c9bb6cf

Browse files
Marc Rasiravikandhadai
Marc Rasi
authored and
ravikandhadai
committed
---
yaml --- r: 349158 b: refs/heads/master-next c: 874bb1d h: refs/heads/master
1 parent 82cfd28 commit c9bb6cf

File tree

165 files changed

+2077
-2037
lines changed

Some content is hidden

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

165 files changed

+2077
-2037
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: 12e455a5d0d313eeb53e7e67ffb4a8c5dd84ee3f
3+
refs/heads/master-next: 874bb1df259607ffe3f03e294a41e7b6048738ed
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/cmake/modules/SwiftSource.cmake

Lines changed: 1 addition & 9 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")
@@ -326,8 +322,6 @@ function(_compile_swift_files
326322
set(sib_file "${module_base}.Onone.sib")
327323
set(sibopt_file "${module_base}.O.sib")
328324
set(sibgen_file "${module_base}.sibgen")
329-
list(APPEND swift_module_flags
330-
"-emit-module-source-info-path" "${source_info_file}")
331325

332326
if(SWIFT_ENABLE_MODULE_INTERFACES)
333327
set(interface_file "${module_base}.swiftinterface")
@@ -355,8 +349,7 @@ function(_compile_swift_files
355349
swift_install_in_component(DIRECTORY "${specific_module_dir}"
356350
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${library_subdir}"
357351
COMPONENT "${SWIFTFILE_INSTALL_IN_COMPONENT}"
358-
OPTIONAL
359-
PATTERN "Private" EXCLUDE)
352+
OPTIONAL)
360353
else()
361354
swift_install_in_component(FILES ${module_outputs}
362355
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${library_subdir}"
@@ -497,7 +490,6 @@ function(_compile_swift_files
497490
COMMAND
498491
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir}
499492
${specific_module_dir}
500-
${specific_module_private_dir}
501493
COMMAND
502494
"${PYTHON_EXECUTABLE}" "${line_directive_tool}" "@${file_path}" --
503495
"${swift_compiler_tool}" "-emit-module" "-o" "${module_file}"

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

Lines changed: 0 additions & 1 deletion
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

‎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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@ class Decl;
2626
class GenericParamList;
2727
class GenericSignature;
2828
class GenericTypeParamType;
29-
class InfixOperatorDecl;
3029
class IterableDeclContext;
3130
class ModuleDecl;
3231
class NominalTypeDecl;
3332
class OperatorDecl;
34-
class PrecedenceGroupDecl;
3533
struct PropertyWrapperBackingPropertyInfo;
3634
struct PropertyWrapperTypeInfo;
3735
enum class CtorInitializerKind;

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6909,6 +6909,7 @@ class OperatorDecl : public Decl {
69096909
/// \endcode
69106910
class InfixOperatorDecl : public OperatorDecl {
69116911
SourceLoc ColonLoc;
6912+
PrecedenceGroupDecl *PrecedenceGroup = nullptr;
69126913

69136914
public:
69146915
InfixOperatorDecl(DeclContext *DC, SourceLoc operatorLoc, Identifier name,
@@ -6919,6 +6920,14 @@ class InfixOperatorDecl : public OperatorDecl {
69196920
identifiers, identifierLocs),
69206921
ColonLoc(colonLoc) {}
69216922

6923+
InfixOperatorDecl(DeclContext *DC, SourceLoc operatorLoc, Identifier name,
6924+
SourceLoc nameLoc, SourceLoc colonLoc,
6925+
PrecedenceGroupDecl *precedenceGroup,
6926+
ArrayRef<NominalTypeDecl *> designatedNominalTypes)
6927+
: OperatorDecl(DeclKind::InfixOperator, DC, operatorLoc, name, nameLoc,
6928+
designatedNominalTypes),
6929+
ColonLoc(colonLoc), PrecedenceGroup(precedenceGroup) {}
6930+
69226931
SourceLoc getEndLoc() const {
69236932
auto identifierLocs = getIdentifierLocs();
69246933
if (identifierLocs.empty())
@@ -6933,7 +6942,10 @@ class InfixOperatorDecl : public OperatorDecl {
69336942

69346943
SourceLoc getColonLoc() const { return ColonLoc; }
69356944

6936-
PrecedenceGroupDecl *getPrecedenceGroup() const;
6945+
PrecedenceGroupDecl *getPrecedenceGroup() const { return PrecedenceGroup; }
6946+
void setPrecedenceGroup(PrecedenceGroupDecl *PGD) {
6947+
PrecedenceGroup = PGD;
6948+
}
69376949

69386950
/// True if this decl's attributes conflict with those declared by another
69396951
/// operator.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ ERROR(error_mode_cannot_emit_module,none,
124124
"this mode does not support emitting modules", ())
125125
ERROR(error_mode_cannot_emit_module_doc,none,
126126
"this mode does not support emitting module documentation files", ())
127-
ERROR(error_mode_cannot_emit_module_source_info,none,
128-
"this mode does not support emitting module source info files", ())
129127
ERROR(error_mode_cannot_emit_interface,none,
130128
"this mode does not support emitting module interface files", ())
131129

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4528,6 +4528,8 @@ ERROR(property_wrapper_wrong_initial_value_init, none,
45284528
(DeclName, Type, Type))
45294529
ERROR(property_wrapper_failable_init, none,
45304530
"%0 cannot be failable", (DeclName))
4531+
ERROR(property_wrapper_ambiguous_initial_value_init, none,
4532+
"property wrapper type %0 has multiple initial-value initializers", (Type))
45314533
ERROR(property_wrapper_ambiguous_default_value_init, none,
45324534
"property wrapper type %0 has multiple default-value initializers", (Type))
45334535
ERROR(property_wrapper_type_requirement_not_accessible,none,

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

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "swift/AST/SimpleRequest.h"
2020
#include "swift/AST/ASTTypeIDs.h"
2121
#include "swift/Basic/Statistic.h"
22-
#include "llvm/ADT/Hashing.h"
2322
#include "llvm/ADT/TinyPtrVector.h"
2423

2524
namespace swift {
@@ -274,56 +273,6 @@ class GenericParamListRequest :
274273
void cacheResult(GenericParamList *value) const;
275274
};
276275

277-
struct PrecedenceGroupDescriptor {
278-
DeclContext *dc;
279-
Identifier ident;
280-
SourceLoc nameLoc;
281-
282-
SourceLoc getLoc() const;
283-
284-
friend llvm::hash_code hash_value(const PrecedenceGroupDescriptor &owner) {
285-
return hash_combine(llvm::hash_value(owner.dc),
286-
llvm::hash_value(owner.ident.getAsOpaquePointer()),
287-
llvm::hash_value(owner.nameLoc.getOpaquePointerValue()));
288-
}
289-
290-
friend bool operator==(const PrecedenceGroupDescriptor &lhs,
291-
const PrecedenceGroupDescriptor &rhs) {
292-
return lhs.dc == rhs.dc &&
293-
lhs.ident == rhs.ident &&
294-
lhs.nameLoc == rhs.nameLoc;
295-
}
296-
297-
friend bool operator!=(const PrecedenceGroupDescriptor &lhs,
298-
const PrecedenceGroupDescriptor &rhs) {
299-
return !(lhs == rhs);
300-
}
301-
};
302-
303-
void simple_display(llvm::raw_ostream &out, const PrecedenceGroupDescriptor &d);
304-
305-
class LookupPrecedenceGroupRequest
306-
: public SimpleRequest<LookupPrecedenceGroupRequest,
307-
PrecedenceGroupDecl *(PrecedenceGroupDescriptor),
308-
CacheKind::Cached> {
309-
public:
310-
using SimpleRequest::SimpleRequest;
311-
312-
private:
313-
friend SimpleRequest;
314-
315-
// Evaluation.
316-
llvm::Expected<PrecedenceGroupDecl *>
317-
evaluate(Evaluator &evaluator, PrecedenceGroupDescriptor descriptor) const;
318-
319-
public:
320-
// Source location
321-
SourceLoc getNearestLoc() const;
322-
323-
// Separate caching.
324-
bool isCached() const { return true; }
325-
};
326-
327276
#define SWIFT_TYPEID_ZONE NameLookup
328277
#define SWIFT_TYPEID_HEADER "swift/AST/NameLookupTypeIDZone.def"
329278
#include "swift/Basic/DefineTypeIDZone.h"

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ SWIFT_REQUEST(NameLookup, InheritedDeclsReferencedRequest,
3030
DirectlyReferencedTypeDecls(
3131
llvm::PointerUnion<TypeDecl *, ExtensionDecl *>, unsigned),
3232
Uncached, HasNearestLocation)
33-
SWIFT_REQUEST(NameLookup, LookupPrecedenceGroupRequest,
34-
PrecedenceGroupDecl *(DeclContext *, Identifier, SourceLoc),
35-
Cached, NoLocationInfo)
3633
SWIFT_REQUEST(NameLookup, SelfBoundsFromWhereClauseRequest,
3734
SelfBounds(llvm::PointerUnion<TypeDecl *, ExtensionDecl *>),
3835
Uncached, NoLocationInfo)

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ struct PropertyWrapperTypeInfo {
3535
/// directed.
3636
VarDecl *valueVar = nullptr;
3737

38-
/// Whether there is an init(wrappedValue:) that will be called when the
38+
/// The initializer init(wrappedValue:) that will be called when the
3939
/// initializing the property wrapper type from a value of the property type.
40-
enum {
41-
NoWrappedValueInit = 0,
42-
HasWrappedValueInit,
43-
HasInitialValueInit
44-
} wrappedValueInit = NoWrappedValueInit;
40+
///
41+
/// This initializer is optional, but if present will be used for the `=`
42+
/// initialization syntax.
43+
ConstructorDecl *wrappedValueInit = nullptr;
4544

4645
/// The initializer `init()` that will be called to default-initialize a
4746
/// value with an attached property wrapper.

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

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class AbstractStorageDecl;
3333
class AccessorDecl;
3434
enum class AccessorKind;
3535
class GenericParamList;
36-
class PrecedenceGroupDecl;
3736
struct PropertyWrapperBackingPropertyInfo;
3837
struct PropertyWrapperMutability;
3938
class RequirementRepr;
@@ -1095,7 +1094,7 @@ class InferredGenericSignatureRequest :
10951094
public SimpleRequest<InferredGenericSignatureRequest,
10961095
GenericSignature *(ModuleDecl *,
10971096
GenericSignature *,
1098-
GenericParamList *,
1097+
SmallVector<GenericParamList *, 2>,
10991098
SmallVector<Requirement, 2>,
11001099
SmallVector<TypeLoc, 2>,
11011100
bool),
@@ -1111,7 +1110,7 @@ class InferredGenericSignatureRequest :
11111110
evaluate(Evaluator &evaluator,
11121111
ModuleDecl *module,
11131112
GenericSignature *baseSignature,
1114-
GenericParamList *gpl,
1113+
SmallVector<GenericParamList *, 2> addedParameters,
11151114
SmallVector<Requirement, 2> addedRequirements,
11161115
SmallVector<TypeLoc, 2> inferenceSources,
11171116
bool allowConcreteGenericParams) const;
@@ -1210,25 +1209,6 @@ class UnderlyingTypeRequest :
12101209
void cacheResult(Type value) const;
12111210
};
12121211

1213-
class OperatorPrecedenceGroupRequest
1214-
: public SimpleRequest<OperatorPrecedenceGroupRequest,
1215-
PrecedenceGroupDecl *(InfixOperatorDecl *),
1216-
CacheKind::Cached> {
1217-
public:
1218-
using SimpleRequest::SimpleRequest;
1219-
1220-
private:
1221-
friend SimpleRequest;
1222-
1223-
// Evaluation.
1224-
llvm::Expected<PrecedenceGroupDecl *>
1225-
evaluate(Evaluator &evaluator, InfixOperatorDecl *PGD) const;
1226-
1227-
public:
1228-
// Separate caching.
1229-
bool isCached() const { return true; }
1230-
};
1231-
12321212
// Allow AnyValue to compare two Type values, even though Type doesn't
12331213
// support ==.
12341214
template<>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ SWIFT_REQUEST(NameLookup, GenericSignatureRequest,
5454
SeparatelyCached, NoLocationInfo)
5555
SWIFT_REQUEST(TypeChecker, InferredGenericSignatureRequest,
5656
GenericSignature *(ModuleDecl *, GenericSignature *,
57-
GenericParamList *,
57+
SmallVector<GenericParamList *, 2>,
5858
SmallVector<Requirement, 2>,
5959
SmallVector<TypeLoc, 2>, bool),
6060
Cached, NoLocationInfo)
@@ -85,9 +85,6 @@ SWIFT_REQUEST(TypeChecker, MangleLocalTypeDeclRequest,
8585
SWIFT_REQUEST(TypeChecker, OpaqueReadOwnershipRequest,
8686
OpaqueReadOwnership(AbstractStorageDecl *), SeparatelyCached,
8787
NoLocationInfo)
88-
SWIFT_REQUEST(TypeChecker, OperatorPrecedenceGroupRequest,
89-
PrecedenceGroupDecl *(PrecedenceGroupDecl *),
90-
Cached, NoLocationInfo)
9188
SWIFT_REQUEST(TypeChecker, OverriddenDeclsRequest,
9289
llvm::TinyPtrVector<ValueDecl *>(ValueDecl *), SeparatelyCached,
9390
NoLocationInfo)

‎branches/master-next/include/swift/Basic/FileTypes.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ TYPE("autolink", AutolinkFile, "autolink", "")
5050
TYPE("swiftmodule", SwiftModuleFile, "swiftmodule", "")
5151
TYPE("swiftdoc", SwiftModuleDocFile, "swiftdoc", "")
5252
TYPE("swiftinterface", SwiftModuleInterfaceFile, "swiftinterface", "")
53-
TYPE("swiftsourceinfo", SwiftSourceInfoFile, "swiftsourceinfo", "")
5453
TYPE("assembly", Assembly, "s", "")
5554
TYPE("raw-sil", RawSIL, "sil", "")
5655
TYPE("raw-sib", RawSIB, "sib", "")

0 commit comments

Comments
 (0)