Merge tag 'swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a' into tensorflow-merge

Tag build swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a

Author: pschuh

include/swift/AST/Decl.h

@@ -807,10 +807,10 @@ class alignas(1 << DeclAlignInBits) Decl {
   bool walk(ASTWalker &walker);
 
   /// Return whether this declaration has been determined invalid.
-  bool isInvalid() const { return Bits.Decl.Invalid; }
+  bool isInvalid() const;
 
   /// Mark this declaration invalid.
-  void setInvalid(bool isInvalid = true) { Bits.Decl.Invalid = isInvalid; }
+  void setInvalid();
 
   /// Determine whether this declaration was implicitly generated by the
   /// compiler (rather than explicitly written in source code).

include/swift/AST/DiagnosticConsumer.h

@@ -45,6 +45,13 @@ struct DiagnosticInfo {
   DiagnosticKind Kind;
   StringRef FormatString;
   ArrayRef<DiagnosticArgument> FormatArgs;
+
+  /// Only used when directing diagnostics to different outputs.
+  /// In batch mode a diagnostic may be
+  /// located in a non-primary file, but there will be no .dia file for a
+  /// non-primary. If valid, this argument contains a location within a buffer
+  /// that corresponds to a primary input. The .dia file for that primary can be
+  /// used for the diagnostic, as if it had occurred at this location.
   SourceLoc BufferIndirectlyCausingDiagnostic;
 
   /// DiagnosticInfo of notes which are children of this diagnostic, if any
@@ -109,29 +116,9 @@ class DiagnosticConsumer {
   /// \param SM The source manager associated with the source locations in
   /// this diagnostic.
   ///
-  /// \param Loc The source location associated with this diagnostic. This
-  /// location may be invalid, if the diagnostic is not directly related to
-  /// the source (e.g., if it comes from command-line parsing).
-  ///
-  /// \param Kind The severity of the diagnostic (error, warning, note).
-  ///
-  /// \param FormatArgs The diagnostic format string arguments.
-  ///
-  /// \param Info Extra information associated with the diagnostic.
-  ///
-  /// \param bufferIndirectlyCausingDiagnostic Only used when directing
-  /// diagnostics to different outputs.
-  /// In batch mode a diagnostic may be
-  /// located in a non-primary file, but there will be no .dia file for a
-  /// non-primary. If valid, this argument contains a location within a buffer
-  /// that corresponds to a primary input. The .dia file for that primary can be
-  /// used for the diagnostic, as if it had occurred at this location.
-  virtual void
-  handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                   StringRef FormatString,
-                   ArrayRef<DiagnosticArgument> FormatArgs,
-                   const DiagnosticInfo &Info,
-                   SourceLoc bufferIndirectlyCausingDiagnostic) = 0;
+  /// \param Info Information describing the diagnostic.
+  virtual void handleDiagnostic(SourceManager &SM,
+                                const DiagnosticInfo &Info) = 0;
 
   /// \returns true if an error occurred while finishing-up.
   virtual bool finishProcessing() { return false; }
@@ -149,11 +136,7 @@ class DiagnosticConsumer {
 /// DiagnosticConsumer that discards all diagnostics.
 class NullDiagnosticConsumer : public DiagnosticConsumer {
 public:
-  void handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                        StringRef FormatString,
-                        ArrayRef<DiagnosticArgument> FormatArgs,
-                        const DiagnosticInfo &Info,
-                        SourceLoc bufferIndirectlyCausingDiagnostic) override;
+  void handleDiagnostic(SourceManager &SM, const DiagnosticInfo &Info) override;
 };
 
 /// DiagnosticConsumer that forwards diagnostics to the consumers of
@@ -162,11 +145,7 @@ class ForwardingDiagnosticConsumer : public DiagnosticConsumer {
   DiagnosticEngine &TargetEngine;
 public:
   ForwardingDiagnosticConsumer(DiagnosticEngine &Target);
-  void handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                        StringRef FormatString,
-                        ArrayRef<DiagnosticArgument> FormatArgs,
-                        const DiagnosticInfo &Info,
-                        SourceLoc bufferIndirectlyCausingDiagnostic) override;
+  void handleDiagnostic(SourceManager &SM, const DiagnosticInfo &Info) override;
 };
 
 /// DiagnosticConsumer that funnels diagnostics in certain files to
@@ -228,18 +207,13 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
                 std::unique_ptr<DiagnosticConsumer> consumer)
         : inputFileName(inputFileName), consumer(std::move(consumer)) {}
 
-    void handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                          StringRef FormatString,
-                          ArrayRef<DiagnosticArgument> FormatArgs,
-                          const DiagnosticInfo &Info,
-                          const SourceLoc bufferIndirectlyCausingDiagnostic) {
+    void handleDiagnostic(SourceManager &SM, const DiagnosticInfo &Info) {
       if (!getConsumer())
         return;
-      hasAnErrorBeenConsumed |= Kind == DiagnosticKind::Error;
-      getConsumer()->handleDiagnostic(SM, Loc, Kind, FormatString, FormatArgs,
-                                      Info, bufferIndirectlyCausingDiagnostic);
+      hasAnErrorBeenConsumed |= Info.Kind == DiagnosticKind::Error;
+      getConsumer()->handleDiagnostic(SM, Info);
     }
-    
+
     void informDriverOfIncompleteBatchModeCompilation() {
       if (!hasAnErrorBeenConsumed && getConsumer())
         getConsumer()->informDriverOfIncompleteBatchModeCompilation();
@@ -324,11 +298,7 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
       SmallVectorImpl<Subconsumer> &consumers);
 
 public:
-  void handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                        StringRef FormatString,
-                        ArrayRef<DiagnosticArgument> FormatArgs,
-                        const DiagnosticInfo &Info,
-                        SourceLoc bufferIndirectlyCausingDiagnostic) override;
+  void handleDiagnostic(SourceManager &SM, const DiagnosticInfo &Info) override;
 
   bool finishProcessing() override;
 
@@ -348,12 +318,10 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
   subconsumerForLocation(SourceManager &SM, SourceLoc loc);
 
   Optional<FileSpecificDiagnosticConsumer::Subconsumer *>
-  findSubconsumer(SourceManager &SM, SourceLoc loc, DiagnosticKind Kind,
-                  SourceLoc bufferIndirectlyCausingDiagnostic);
+  findSubconsumer(SourceManager &SM, const DiagnosticInfo &Info);
 
   Optional<FileSpecificDiagnosticConsumer::Subconsumer *>
-  findSubconsumerForNonNote(SourceManager &SM, SourceLoc loc,
-                            SourceLoc bufferIndirectlyCausingDiagnostic);
+  findSubconsumerForNonNote(SourceManager &SM, const DiagnosticInfo &Info);
 };
 
 } // end namespace swift

include/swift/AST/TypeCheckRequests.h

@@ -1634,6 +1634,26 @@ class SynthesizeDefaultInitRequest
   bool isCached() const { return true; }
 };
 
+class CompareDeclSpecializationRequest
+    : public SimpleRequest<CompareDeclSpecializationRequest,
+                           bool(DeclContext *, ValueDecl *, ValueDecl *, bool),
+                           CacheKind::Cached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<bool> evaluate(Evaluator &evaluator, DeclContext *DC,
+                                ValueDecl *VD1, ValueDecl *VD2,
+                                bool dynamic) const;
+
+public:
+  // Caching.
+  bool isCached() const { return true; }
+};
+
 // Allow AnyValue to compare two Type values, even though Type doesn't
 // support ==.
 template<>

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -29,6 +29,9 @@ SWIFT_REQUEST(TypeChecker, AttachedPropertyWrappersRequest,
               NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ClassAncestryFlagsRequest,
               AncestryFlags(ClassDecl *), Cached, NoLocationInfo)
+SWIFT_REQUEST(TypeChecker, CompareDeclSpecializationRequest,
+              bool (DeclContext *, ValueDecl *, ValueDecl *, bool), Cached,
+              NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, DefaultDefinitionTypeRequest,
               Type(AssociatedTypeDecl *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, DefaultTypeRequest,

include/swift/Frontend/PrintingDiagnosticConsumer.h

@@ -35,12 +35,8 @@ class PrintingDiagnosticConsumer : public DiagnosticConsumer {
   PrintingDiagnosticConsumer(llvm::raw_ostream &stream = llvm::errs()) :
     Stream(stream) { }
 
-  virtual void
-  handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                   StringRef FormatString,
-                   ArrayRef<DiagnosticArgument> FormatArgs,
-                   const DiagnosticInfo &Info,
-                   SourceLoc bufferIndirectlyCausingDiagnostic) override;
+  virtual void handleDiagnostic(SourceManager &SM,
+                                const DiagnosticInfo &Info) override;
 
   void forceColors() {
     ForceColors = true;
@@ -52,11 +48,7 @@ class PrintingDiagnosticConsumer : public DiagnosticConsumer {
   }
 
 private:
-  void printDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                       StringRef FormatString,
-                       ArrayRef<DiagnosticArgument> FormatArgs,
-                       const DiagnosticInfo &Info,
-                       SourceLoc bufferIndirectlyCausingDiagnostic);
+  void printDiagnostic(SourceManager &SM, const DiagnosticInfo &Info);
 };
 
 }

include/swift/Migrator/FixitApplyDiagnosticConsumer.h

@@ -62,11 +62,7 @@ class FixitApplyDiagnosticConsumer final
   /// output stream.
   void printResult(llvm::raw_ostream &OS) const;
 
-  void handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
-                        StringRef FormatString,
-                        ArrayRef<DiagnosticArgument> FormatArgs,
-                        const DiagnosticInfo &Info,
-                        SourceLoc bufferIndirectlyCausingDiagnostic) override;
+  void handleDiagnostic(SourceManager &SM, const DiagnosticInfo &Info) override;
 
   unsigned getNumFixitsApplied() const {
     return NumFixitsApplied;

include/swift/Migrator/FixitFilter.h

@@ -25,8 +25,7 @@ namespace migrator {
 
 struct FixitFilter {
   /// Returns true if the fix-it should be applied.
-  bool shouldTakeFixit(const DiagnosticKind Kind,
-                       const DiagnosticInfo &Info) const {
+  bool shouldTakeFixit(const DiagnosticInfo &Info) const {
     // Do not add a semi or comma as it is wrong in most cases during migration
     if (Info.ID == diag::statement_same_line_without_semi.ID ||
         Info.ID == diag::declaration_same_line_without_semi.ID ||
@@ -114,7 +113,7 @@ struct FixitFilter {
       return false;
     }
 
-    if (Kind == DiagnosticKind::Error)
+    if (Info.Kind == DiagnosticKind::Error)
       return true;
 
     // Fixits from warnings/notes that should be applied.

lib/AST/ASTMangler.cpp

@@ -2461,7 +2461,7 @@ CanType ASTMangler::getDeclTypeForMangling(
   parentGenericSig = GenericSignature();
 
   auto &C = decl->getASTContext();
-  if (!decl->getInterfaceType() || decl->getInterfaceType()->is<ErrorType>()) {
+  if (decl->isInvalid()) {
     if (isa<AbstractFunctionDecl>(decl))
       return CanFunctionType::get({AnyFunctionType::Param(C.TheErrorType)},
                                   C.TheErrorType);

lib/AST/ASTPrinter.cpp

@@ -2875,7 +2875,7 @@ void PrintAST::printEnumElement(EnumElementDecl *elt) {
 
 
     auto params = ArrayRef<AnyFunctionType::Param>();
-    if (elt->hasInterfaceType() && !elt->getInterfaceType()->hasError()) {
+    if (elt->hasInterfaceType() && !elt->isInvalid()) {
       // Walk to the params of the associated values.
       // (EnumMetaType) -> (AssocValues) -> Enum
       params = elt->getInterfaceType()->castTo<AnyFunctionType>()
@@ -2972,7 +2972,7 @@ void PrintAST::visitSubscriptDecl(SubscriptDecl *decl) {
   }, [&] { // Parameters
     printGenericDeclGenericParams(decl);
     auto params = ArrayRef<AnyFunctionType::Param>();
-    if (decl->hasInterfaceType() && !decl->getInterfaceType()->hasError()) {
+    if (decl->hasInterfaceType() && !decl->isInvalid()) {
       // Walk to the params of the subscript's indices.
       params = decl->getInterfaceType()->castTo<AnyFunctionType>()->getParams();
     }

lib/AST/AccessRequests.cpp

@@ -81,7 +81,7 @@ AccessLevelRequest::evaluate(Evaluator &evaluator, ValueDecl *D) const {
   // Special case for dtors and enum elements: inherit from container
   if (D->getKind() == DeclKind::Destructor ||
       D->getKind() == DeclKind::EnumElement) {
-    if (D->isInvalid()) {
+    if (D->hasInterfaceType() && D->isInvalid()) {
       return AccessLevel::Private;
     } else {
       auto container = cast<NominalTypeDecl>(D->getDeclContext());

lib/AST/Decl.cpp

@@ -376,6 +376,77 @@ DeclContext *Decl::getInnermostDeclContext() const {
   return getDeclContext();
 }
 
+bool Decl::isInvalid() const {
+  switch (getKind()) {
+#define VALUE_DECL(ID, PARENT)
+#define DECL(ID, PARENT) \
+  case DeclKind::ID:
+#include "swift/AST/DeclNodes.def"
+    return Bits.Decl.Invalid;
+  case DeclKind::Param: {
+    // Parameters are special because closure parameters may not have type
+    // annotations. In which case, the interface type request returns
+    // ErrorType. Therefore, consider parameters with implicit types to always
+    // be valid.
+    auto *PD = cast<ParamDecl>(this);
+    if (!PD->getTypeRepr() && !PD->hasInterfaceType())
+      return false;
+  }
+    LLVM_FALLTHROUGH;
+  case DeclKind::Enum:
+  case DeclKind::Struct:
+  case DeclKind::Class:
+  case DeclKind::Protocol:
+  case DeclKind::OpaqueType:
+  case DeclKind::TypeAlias:
+  case DeclKind::GenericTypeParam:
+  case DeclKind::AssociatedType:
+  case DeclKind::Module:
+  case DeclKind::Var:
+  case DeclKind::Subscript:
+  case DeclKind::Constructor:
+  case DeclKind::Destructor:
+  case DeclKind::Func:
+  case DeclKind::Accessor:
+  case DeclKind::EnumElement:
+    return cast<ValueDecl>(this)->getInterfaceType()->hasError();
+  }
+
+  llvm_unreachable("Unknown decl kind");
+}
+
+void Decl::setInvalid() {
+  switch (getKind()) {
+#define VALUE_DECL(ID, PARENT)
+#define DECL(ID, PARENT) \
+  case DeclKind::ID:
+#include "swift/AST/DeclNodes.def"
+    Bits.Decl.Invalid = true;
+    return;
+  case DeclKind::Enum:
+  case DeclKind::Struct:
+  case DeclKind::Class:
+  case DeclKind::Protocol:
+  case DeclKind::OpaqueType:
+  case DeclKind::TypeAlias:
+  case DeclKind::GenericTypeParam:
+  case DeclKind::AssociatedType:
+  case DeclKind::Module:
+  case DeclKind::Var:
+  case DeclKind::Param:
+  case DeclKind::Subscript:
+  case DeclKind::Constructor:
+  case DeclKind::Destructor:
+  case DeclKind::Func:
+  case DeclKind::Accessor:
+  case DeclKind::EnumElement:
+    cast<ValueDecl>(this)->setInterfaceType(ErrorType::get(getASTContext()));
+    return;
+  }
+
+  llvm_unreachable("Unknown decl kind");
+}
+
 void Decl::setDeclContext(DeclContext *DC) { 
   Context = DC;
 }