Merge branch 'master' into martinboehme-patch-1

Author: martinboehme

include/swift/AST/ASTTypeIDZone.def

@@ -57,6 +57,7 @@ SWIFT_TYPEID_NAMED(PatternBindingEntry *, PatternBindingEntry)
 SWIFT_TYPEID_NAMED(PostfixOperatorDecl *, PostfixOperatorDecl)
 SWIFT_TYPEID_NAMED(PrecedenceGroupDecl *, PrecedenceGroupDecl)
 SWIFT_TYPEID_NAMED(PrefixOperatorDecl *, PrefixOperatorDecl)
+SWIFT_TYPEID_NAMED(ProtocolConformance *, ProtocolConformance)
 SWIFT_TYPEID_NAMED(ProtocolDecl *, ProtocolDecl)
 SWIFT_TYPEID_NAMED(SourceFile *, SourceFile)
 SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)

include/swift/AST/ASTTypeIDs.h

@@ -52,6 +52,7 @@ struct PropertyWrapperTypeInfo;
 enum class CtorInitializerKind;
 struct PropertyWrapperLValueness;
 struct PropertyWrapperMutability;
+class ProtocolConformance;
 class ProtocolDecl;
 class Requirement;
 enum class ResilienceExpansion : unsigned;

include/swift/AST/DiagnosticsSema.def

@@ -5069,6 +5069,14 @@ NOTE(function_builder_remove_attr, none,
      "remove the attribute to explicitly disable the function builder", ())
 NOTE(function_builder_remove_returns, none,
      "remove 'return' statements to apply the function builder", ())
+ERROR(function_builder_infer_ambig, none,
+      "ambiguous function builder inferred for %0: %1 or %2",
+      (DeclName, Type, Type))
+NOTE(function_builder_infer_add_return, none,
+     "add an explicit 'return' statement to not use a function builder", ())
+NOTE(function_builder_infer_pick_specific, none,
+     "apply function builder %0 (inferred from protocol %1)",
+     (Type, DeclName))
 
 //------------------------------------------------------------------------------
 // MARK: Tuple Shuffle Diagnostics

include/swift/AST/SILGenRequests.h

@@ -40,38 +40,39 @@ template<typename Request>
 void reportEvaluatedRequest(UnifiedStatsReporter &stats,
                             const Request &request);
 
-struct SILGenDescriptor {
+/// Describes a file or module to be lowered to SIL.
+struct ASTLoweringDescriptor {
   llvm::PointerUnion<FileUnit *, ModuleDecl *> context;
   Lowering::TypeConverter &conv;
   const SILOptions &opts;
 
-  friend llvm::hash_code hash_value(const SILGenDescriptor &owner) {
+  friend llvm::hash_code hash_value(const ASTLoweringDescriptor &owner) {
     return llvm::hash_combine(owner.context, (void *)&owner.conv,
                               (void *)&owner.opts);
   }
 
-  friend bool operator==(const SILGenDescriptor &lhs,
-                         const SILGenDescriptor &rhs) {
+  friend bool operator==(const ASTLoweringDescriptor &lhs,
+                         const ASTLoweringDescriptor &rhs) {
     return lhs.context == rhs.context &&
            &lhs.conv == &rhs.conv &&
            &lhs.opts == &rhs.opts;
   }
 
-  friend bool operator!=(const SILGenDescriptor &lhs,
-                         const SILGenDescriptor &rhs) {
+  friend bool operator!=(const ASTLoweringDescriptor &lhs,
+                         const ASTLoweringDescriptor &rhs) {
     return !(lhs == rhs);
   }
 
 public:
-  static SILGenDescriptor forFile(FileUnit &sf, Lowering::TypeConverter &conv,
-                                  const SILOptions &opts) {
-    return SILGenDescriptor{&sf, conv, opts};
+  static ASTLoweringDescriptor
+  forFile(FileUnit &sf, Lowering::TypeConverter &conv, const SILOptions &opts) {
+    return ASTLoweringDescriptor{&sf, conv, opts};
   }
 
-  static SILGenDescriptor forWholeModule(ModuleDecl *mod,
-                                         Lowering::TypeConverter &conv,
-                                         const SILOptions &opts) {
-    return SILGenDescriptor{mod, conv, opts};
+  static ASTLoweringDescriptor forWholeModule(ModuleDecl *mod,
+                                              Lowering::TypeConverter &conv,
+                                              const SILOptions &opts) {
+    return ASTLoweringDescriptor{mod, conv, opts};
   }
 
   /// For a single file input, returns a single element array containing that
@@ -83,13 +84,17 @@ struct SILGenDescriptor {
   SourceFile *getSourceFileToParse() const;
 };
 
-void simple_display(llvm::raw_ostream &out, const SILGenDescriptor &d);
+void simple_display(llvm::raw_ostream &out, const ASTLoweringDescriptor &d);
 
-SourceLoc extractNearestSourceLoc(const SILGenDescriptor &desc);
+SourceLoc extractNearestSourceLoc(const ASTLoweringDescriptor &desc);
 
-class SILGenerationRequest
+/// Lowers a file or module to SIL. In most cases this involves transforming
+/// a file's AST into SIL, through SILGen. However it can also handle files
+/// containing SIL in textual or binary form, which will be parsed or
+/// deserialized as needed.
+class ASTLoweringRequest
     : public SimpleRequest<
-          SILGenerationRequest, std::unique_ptr<SILModule>(SILGenDescriptor),
+          ASTLoweringRequest, std::unique_ptr<SILModule>(ASTLoweringDescriptor),
           RequestFlags::Uncached | RequestFlags::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;
@@ -98,8 +103,8 @@ class SILGenerationRequest
   friend SimpleRequest;
 
   // Evaluation.
-  std::unique_ptr<SILModule>
-  evaluate(Evaluator &evaluator, SILGenDescriptor desc) const;
+  std::unique_ptr<SILModule> evaluate(Evaluator &evaluator,
+                                      ASTLoweringDescriptor desc) const;
 
 public:
   // Incremental dependencies.
@@ -110,7 +115,7 @@ class SILGenerationRequest
 /// Parses a .sil file into a SILModule.
 class ParseSILModuleRequest
     : public SimpleRequest<ParseSILModuleRequest,
-                           std::unique_ptr<SILModule>(SILGenDescriptor),
+                           std::unique_ptr<SILModule>(ASTLoweringDescriptor),
                            RequestFlags::Uncached> {
 public:
   using SimpleRequest::SimpleRequest;
@@ -119,8 +124,8 @@ class ParseSILModuleRequest
   friend SimpleRequest;
 
   // Evaluation.
-  std::unique_ptr<SILModule>
-  evaluate(Evaluator &evaluator, SILGenDescriptor desc) const;
+  std::unique_ptr<SILModule> evaluate(Evaluator &evaluator,
+                                      ASTLoweringDescriptor desc) const;
 };
 
 /// The zone number for SILGen.

include/swift/AST/SILGenTypeIDZone.def

@@ -14,9 +14,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-SWIFT_REQUEST(SILGen, SILGenerationRequest,
-              std::unique_ptr<SILModule>(SILGenDescriptor),
+SWIFT_REQUEST(SILGen, ASTLoweringRequest,
+              std::unique_ptr<SILModule>(ASTLoweringDescriptor),
               Uncached, NoLocationInfo)
 SWIFT_REQUEST(SILGen, ParseSILModuleRequest,
-              std::unique_ptr<SILModule>(SILGenDescriptor),
+              std::unique_ptr<SILModule>(ASTLoweringDescriptor),
               Uncached, NoLocationInfo)

include/swift/AST/SemanticAttrs.def

@@ -51,6 +51,7 @@ SEMANTICS_ATTR(ARRAY_GET_ELEMENT_ADDRESS, "array.get_element_address")
 SEMANTICS_ATTR(ARRAY_INIT, "array.init")
 SEMANTICS_ATTR(ARRAY_INIT_EMPTY, "array.init.empty")
 SEMANTICS_ATTR(ARRAY_MAKE_MUTABLE, "array.make_mutable")
+SEMANTICS_ATTR(ARRAY_END_MUTATION, "array.end_mutation")
 SEMANTICS_ATTR(ARRAY_MUTATE_UNKNOWN, "array.mutate_unknown")
 SEMANTICS_ATTR(ARRAY_PROPS_IS_NATIVE_TYPE_CHECKED, "array.props.isNativeTypeChecked")
 SEMANTICS_ATTR(ARRAY_RESERVE_CAPACITY_FOR_APPEND, "array.reserve_capacity_for_append")
@@ -67,6 +68,8 @@ SEMANTICS_ATTR(OPTIMIZE_SIL_SPECIALIZE_GENERIC_PARTIAL_NEVER,
           "optimize.sil.specialize.generic.partial.never")
 SEMANTICS_ATTR(OPTIMIZE_SIL_SPECIALIZE_GENERIC_SIZE_NEVER,
           "optimize.sil.specialize.generic.size.never")
+SEMANTICS_ATTR(OPTIMIZE_SIL_SPECIALIZE_OWNED2GUARANTEE_NEVER,
+          "optimize.sil.specialize.owned2guarantee.never")
 
 SEMANTICS_ATTR(OSLOG_MESSAGE_INIT_INTERPOLATION, "oslog.message.init_interpolation")
 SEMANTICS_ATTR(OSLOG_MESSAGE_INIT_STRING_LITERAL, "oslog.message.init_stringliteral")

include/swift/AST/TypeCheckRequests.h

@@ -2240,7 +2240,7 @@ class ClosureHasExplicitResultRequest
   bool isCached() const { return true; }
 };
 
-using ProtocolConformanceLookupResult = SmallVector<ProtocolConformance *, 2>;
+using ProtocolConformanceLookupResult = std::vector<ProtocolConformance *>;
 void simple_display(llvm::raw_ostream &out, ConformanceLookupKind kind);
 
 /// Lookup and expand all conformances in the given context.
@@ -2262,7 +2262,7 @@ class LookupAllConformancesInContextRequest
     : public SimpleRequest<LookupAllConformancesInContextRequest,
                            ProtocolConformanceLookupResult(
                                const IterableDeclContext *),
-                           RequestFlags::Uncached |
+                           RequestFlags::Cached |
                                RequestFlags::DependencySink |
                                RequestFlags::DependencySource> {
 public:
@@ -2276,6 +2276,8 @@ class LookupAllConformancesInContextRequest
   evaluate(Evaluator &evaluator, const IterableDeclContext *IDC) const;
 
 public:
+  bool isCached() const { return true; }
+
   // Incremental dependencies
   evaluator::DependencySource
   readDependencySource(const evaluator::DependencyRecorder &eval) const;

include/swift/Basic/DiagnosticOptions.h

@@ -32,6 +32,8 @@ class DiagnosticOptions {
     VerifyAndApplyFixes
   } VerifyMode = NoVerify;
 
+  enum FormattingStyle { LLVM, Swift };
+
   /// Indicates whether to allow diagnostics for \c <unknown> locations if
   /// \c VerifyMode is not \c NoVerify.
   bool VerifyIgnoreUnknown = false;
@@ -61,7 +63,7 @@ class DiagnosticOptions {
 
   // If set to true, use the more descriptive experimental formatting style for
   // diagnostics.
-  bool EnableExperimentalFormatting = false;
+  FormattingStyle PrintedFormattingStyle = FormattingStyle::LLVM;
 
   std::string DiagnosticDocumentationPath = "";
 

include/swift/Basic/SimpleDisplay.h

@@ -136,6 +136,20 @@ namespace swift {
     out << "}";
   }
 
+  template<typename T>
+  void simple_display(llvm::raw_ostream &out,
+                      const std::vector<T> &vec) {
+    out << "{";
+    bool first = true;
+    for (const T &value : vec) {
+      if (first) first = false;
+      else out << ", ";
+
+      simple_display(out, value);
+    }
+    out << "}";
+  }
+
   template<typename T, typename U>
   void simple_display(llvm::raw_ostream &out,
                       const llvm::PointerUnion<T, U> &ptrUnion) {

include/swift/Basic/SourceManager.h

@@ -206,7 +206,7 @@ class SourceManager {
   ///
   /// This respects \c #sourceLocation directives.
   std::pair<unsigned, unsigned>
-  getLineAndColumn(SourceLoc Loc, unsigned BufferID = 0) const {
+  getPresumedLineAndColumnForLoc(SourceLoc Loc, unsigned BufferID = 0) const {
     assert(Loc.isValid());
     int LineOffset = getLineOffset(Loc);
     int l, c;
@@ -215,14 +215,15 @@ class SourceManager {
     return { LineOffset + l, c };
   }
 
-  /// Returns the real line number for a source location.
+  /// Returns the real line and column for a source location.
   ///
   /// If \p BufferID is provided, \p Loc must come from that source buffer.
   ///
   /// This does not respect \c #sourceLocation directives.
-  unsigned getLineNumber(SourceLoc Loc, unsigned BufferID = 0) const {
+  std::pair<unsigned, unsigned>
+  getLineAndColumnInBuffer(SourceLoc Loc, unsigned BufferID = 0) const {
     assert(Loc.isValid());
-    return LLVMSourceMgr.FindLineNumber(Loc.Value, BufferID);
+    return LLVMSourceMgr.getLineAndColumn(Loc.Value, BufferID);
   }
 
   StringRef getEntireTextForBuffer(unsigned BufferID) const;