Merge branch 'master' into mracek/arm64e

Author: kubamracek

include/swift/AST/ASTContext.h

@@ -110,6 +110,7 @@ namespace swift {
   struct RawComment;
   class DocComment;
   class SILBoxType;
+  class SILTransform;
   class TypeAliasDecl;
   class VarDecl;
   class UnifiedStatsReporter;
@@ -623,10 +624,27 @@ class ASTContext final {
   void addDestructorCleanup(T &object) {
     addCleanup([&object]{ object.~T(); });
   }
+
+  /// Get the runtime availability of the class metadata update callback
+  /// mechanism for the target platform.
+  AvailabilityContext getObjCMetadataUpdateCallbackAvailability();
+
+  /// Get the runtime availability of the objc_getClass() hook for the target
+  /// platform.
+  AvailabilityContext getObjCGetClassHookAvailability();
 
-  /// Get the runtime availability of the opaque types language feature for the target platform.
+  /// Get the runtime availability of features introduced in the Swift 5.0
+  /// compiler for the target platform.
+  AvailabilityContext getSwift50Availability();
+
+  /// Get the runtime availability of the opaque types language feature for the
+  /// target platform.
   AvailabilityContext getOpaqueTypeAvailability();
 
+  /// Get the runtime availability of the objc_loadClassref() entry point for
+  /// the target platform.
+  AvailabilityContext getObjCClassStubsAvailability();
+
   /// Get the runtime availability of features introduced in the Swift 5.1
   /// compiler for the target platform.
   AvailabilityContext getSwift51Availability();
@@ -978,6 +996,15 @@ class ASTContext final {
   /// Each kind and SourceFile has its own cache for a Type.
   Type &getDefaultTypeRequestCache(SourceFile *, KnownProtocolKind);
 
+  using SILTransformCtors = ArrayRef<SILTransform *(*)(void)>;
+
+  /// Register IRGen specific SIL passes such that the SILOptimizer can access
+  /// and execute them without directly depending on IRGen.
+  void registerIRGenSILTransforms(SILTransformCtors fns);
+
+  /// Retrieve the IRGen specific SIL passes.
+  SILTransformCtors getIRGenSILTransforms() const;
+
 private:
   friend Decl;
   Optional<RawComment> getRawComment(const Decl *D);

include/swift/AST/DiagnosticConsumer.h

@@ -126,6 +126,9 @@ class DiagnosticConsumer {
   /// \returns true if an error occurred while finishing-up.
   virtual bool finishProcessing() { return false; }
 
+  /// Flush any in-flight diagnostics.
+  virtual void flush() {}
+
   /// In batch mode, any error causes failure for all primary files, but
   /// anyone consulting .dia files will only see an error for a particular
   /// primary in that primary's serialized diagnostics file. For other

include/swift/AST/DiagnosticEngine.h

@@ -676,8 +676,8 @@ namespace swift {
     /// Print diagnostic names after their messages
     bool printDiagnosticNames = false;
 
-    /// Use descriptive diagnostic style when available.
-    bool useDescriptiveDiagnostics = false;
+    /// Use educational notes when available.
+    bool useEducationalNotes = false;
 
     /// Path to diagnostic documentation directory.
     std::string diagnosticDocumentationPath = "";
@@ -705,6 +705,11 @@ namespace swift {
       return state.getShowDiagnosticsAfterFatalError();
     }
 
+    void flushConsumers() {
+      for (auto consumer : Consumers)
+        consumer->flush();
+    }
+
     /// Whether to skip emitting warnings
     void setSuppressWarnings(bool val) { state.setSuppressWarnings(val); }
     bool getSuppressWarnings() const {
@@ -725,12 +730,8 @@ namespace swift {
       return printDiagnosticNames;
     }
 
-    void setUseDescriptiveDiagnostics(bool val) {
-       useDescriptiveDiagnostics = val;
-    }
-    bool getUseDescriptiveDiagnostics() const {
-      return useDescriptiveDiagnostics;
-    }
+    void setUseEducationalNotes(bool val) { useEducationalNotes = val; }
+    bool getUseEducationalNotes() const { return useEducationalNotes; }
 
     void setDiagnosticDocumentationPath(std::string path) {
       diagnosticDocumentationPath = path;

include/swift/AST/DiagnosticsDriver.def

@@ -159,6 +159,9 @@ WARNING(warn_ignore_embed_bitcode_marker, none,
 WARNING(verify_debug_info_requires_debug_option,none,
         "ignoring '-verify-debug-info'; no debug info is being generated", ())
 
+ERROR(verify_incremental_dependencies_needs_incremental,none,
+      "'-verify-incremental-dependencies' requires '-incremental'", ())
+
 ERROR(error_profile_missing,none,
       "no profdata file exists at '%0'", (StringRef))
 

include/swift/AST/DiagnosticsFrontend.def

@@ -372,6 +372,8 @@ NOTE(compiled_module_invalid_reason,none,
 ERROR(unknown_forced_module_loading_mode,none,
       "unknown value for SWIFT_FORCE_MODULE_LOADING variable: '%0'",
       (StringRef))
+ERROR(error_creating_remark_serializer,none,
+      "error while creating remark serializer: '%0'", (StringRef))
 
 REMARK(interface_file_lock_failure,none,
       "could not acquire lock file for module interface '%0'", (StringRef))

include/swift/AST/SILOptimizerRequests.h

@@ -0,0 +1,96 @@
+//===--- SILOptimizerRequests.h - SILOptimizer Requests ---------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  This file defines SILOptimizer requests.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_SILOPTIMIZER_REQUESTS_H
+#define SWIFT_SILOPTIMIZER_REQUESTS_H
+
+#include "swift/AST/ASTTypeIDs.h"
+#include "swift/AST/SimpleRequest.h"
+
+namespace swift {
+
+namespace irgen {
+class IRGenModule;
+}
+
+class SILModule;
+class SILPassPipelinePlan;
+
+struct SILPipelineExecutionDescriptor {
+  SILModule *SM;
+
+  // Note that we currently store a reference to the pipeline plan on the stack.
+  // If ExecuteSILPipelineRequest ever becomes cached, we will need to adjust
+  // this.
+  const SILPassPipelinePlan &Plan;
+  bool IsMandatory;
+  irgen::IRGenModule *IRMod;
+
+  bool operator==(const SILPipelineExecutionDescriptor &other) const;
+  bool operator!=(const SILPipelineExecutionDescriptor &other) const {
+    return !(*this == other);
+  }
+};
+
+llvm::hash_code hash_value(const SILPipelineExecutionDescriptor &desc);
+
+/// Executes a SIL pipeline plan on a SIL module.
+class ExecuteSILPipelineRequest
+    : public SimpleRequest<ExecuteSILPipelineRequest,
+                           bool(SILPipelineExecutionDescriptor),
+                           CacheKind::Uncached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<bool> evaluate(Evaluator &evaluator,
+                                SILPipelineExecutionDescriptor desc) const;
+};
+
+void simple_display(llvm::raw_ostream &out,
+                    const SILPipelineExecutionDescriptor &desc);
+
+SourceLoc extractNearestSourceLoc(const SILPipelineExecutionDescriptor &desc);
+
+/// Report that a request of the given kind is being evaluated, so it
+/// can be recorded by the stats reporter.
+template <typename Request>
+void reportEvaluatedRequest(UnifiedStatsReporter &stats,
+                            const Request &request);
+
+/// The zone number for SILOptimizer.
+#define SWIFT_TYPEID_ZONE SILOptimizer
+#define SWIFT_TYPEID_HEADER "swift/AST/SILOptimizerTypeIDZone.def"
+#include "swift/Basic/DefineTypeIDZone.h"
+#undef SWIFT_TYPEID_ZONE
+#undef SWIFT_TYPEID_HEADER
+
+// Set up reporting of evaluated requests.
+#define SWIFT_REQUEST(Zone, RequestType, Sig, Caching, LocOptions)             \
+template<>                                                                     \
+inline void reportEvaluatedRequest(UnifiedStatsReporter &stats,                \
+                                   const RequestType &request) {               \
+  ++stats.getFrontendCounters().RequestType;                                   \
+}
+#include "swift/AST/SILOptimizerTypeIDZone.def"
+#undef SWIFT_REQUEST
+
+} // end namespace swift
+
+#endif // SWIFT_SILOPTIMIZER_REQUESTS_H

include/swift/AST/SILOptimizerTypeIDZone.def

@@ -0,0 +1,18 @@
+//===--- SILOptimizerTypeIDZone.def -----------------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  This definition file describes the requests in SILOptimizer's zone.
+//
+//===----------------------------------------------------------------------===//
+
+SWIFT_REQUEST(SILOptimizer, ExecuteSILPipelineRequest,
+              bool(SILPipelineExecutionDescriptor), Uncached, NoLocationInfo)

include/swift/AST/SILOptions.h

@@ -23,6 +23,7 @@
 #include "swift/Basic/OptimizationMode.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Remarks/RemarkFormat.h"
 #include <string>
 #include <climits>
 
@@ -161,10 +162,17 @@ class SILOptions {
   /// pipeline or after serialization.
   bool StripOwnershipAfterSerialization = true;
 
-  /// The name of the file to which the backend should save YAML optimization
+  /// The name of the file to which the backend should save optimization
   /// records.
   std::string OptRecordFile;
 
+  /// The regex that filters the passes that should be saved to the optimization
+  /// records.
+  std::string OptRecordPasses;
+
+  /// The format used for serializing remarks (default: YAML)
+  llvm::remarks::Format OptRecordFormat = llvm::remarks::Format::YAML;
+
   SILOptions() {}
 
   /// Return a hash code of any components from these options that should

include/swift/AST/SourceFile.h

@@ -90,6 +90,36 @@ class SourceFile final : public FileUnit {
     }
   };
 
+  /// Flags that direct how the source file is parsed.
+  enum class ParsingFlags : uint8_t {
+    /// Whether to disable delayed parsing for nominal type, extension, and
+    /// function bodies.
+    ///
+    /// If set, type and function bodies will be parsed eagerly. Otherwise they
+    /// will be lazily parsed when their contents is queried. This lets us avoid
+    /// building AST nodes when they're not needed.
+    ///
+    /// This is set for primary files, since we want to type check all
+    /// declarations and function bodies anyway, so there's no benefit in lazy
+    /// parsing.
+    DisableDelayedBodies = 1 << 0,
+
+    /// Whether to disable evaluating the conditions of #if decls.
+    ///
+    /// If set, #if decls are parsed as-is. Otherwise, the bodies of any active
+    /// clauses are hoisted such that they become sibling nodes with the #if
+    /// decl.
+    ///
+    /// FIXME: When condition evaluation moves to a later phase, remove this
+    /// and adjust the client call 'performParseOnly'.
+    DisablePoundIfEvaluation = 1 << 1,
+
+    /// Whether to suppress warnings when parsing. This is set for secondary
+    /// files, as they get parsed multiple times.
+    SuppressWarnings = 1 << 2
+  };
+  using ParsingOptions = OptionSet<ParsingFlags>;
+
 private:
   std::unique_ptr<SourceLookupCache> Cache;
   SourceLookupCache &getCache() const;
@@ -132,6 +162,9 @@ class SourceFile final : public FileUnit {
   /// If not, we can fast-path module checks.
   bool HasImplementationOnlyImports = false;
 
+  /// The parsing options for the file.
+  ParsingOptions ParsingOpts;
+
   /// The scope map that describes this source file.
   std::unique_ptr<ASTScope> Scope;
 
@@ -196,6 +229,9 @@ class SourceFile final : public FileUnit {
     Decls.resize(count);
   }
 
+  /// Retrieve the parsing options for the file.
+  ParsingOptions getParsingOptions() const { return ParsingOpts; }
+
   /// A cache of syntax nodes that can be reused when creating the syntax tree
   /// for this file.
   swift::SyntaxParsingCache *SyntaxParsingCache = nullptr;
@@ -270,7 +306,7 @@ class SourceFile final : public FileUnit {
 
   SourceFile(ModuleDecl &M, SourceFileKind K, Optional<unsigned> bufferID,
              ImplicitModuleImportKind ModImpKind, bool KeepParsedTokens = false,
-             bool KeepSyntaxTree = false);
+             bool KeepSyntaxTree = false, ParsingOptions parsingOpts = {});
 
   ~SourceFile();
 
@@ -533,6 +569,10 @@ class SourceFile final : public FileUnit {
 
   bool isSuitableForASTScopes() const { return canBeParsedInFull(); }
 
+  /// Whether the bodies of types and functions within this file can be lazily
+  /// parsed.
+  bool hasDelayedBodyParsing() const;
+
   syntax::SourceFileSyntax getSyntaxRoot() const;
   void setSyntaxRoot(syntax::SourceFileSyntax &&Root);
   bool hasSyntaxRoot() const;
@@ -556,6 +596,11 @@ class SourceFile final : public FileUnit {
   std::unique_ptr<SourceFileSyntaxInfo> SyntaxInfo;
 };
 
+inline SourceFile::ParsingOptions operator|(SourceFile::ParsingFlags lhs,
+                                            SourceFile::ParsingFlags rhs) {
+  return SourceFile::ParsingOptions(lhs) | rhs;
+}
+
 inline SourceFile &
 ModuleDecl::getMainSourceFile(SourceFileKind expectedKind) const {
   assert(!Files.empty() && "No files added yet");

include/swift/Basic/DiagnosticOptions.h

@@ -55,9 +55,13 @@ class DiagnosticOptions {
   // When printing diagnostics, include the diagnostic name at the end
   bool PrintDiagnosticNames = false;
 
-  /// If set to true, produce more descriptive diagnostic output if available.
-  /// Descriptive diagnostic output is not intended to be machine-readable.
-  bool EnableDescriptiveDiagnostics = false;
+  /// If set to true, display educational note content to the user if available.
+  /// Educational notes are documentation which supplement diagnostics.
+  bool EnableEducationalNotes = false;
+
+  // If set to true, use the more descriptive experimental formatting style for
+  // diagnostics.
+  bool EnableExperimentalFormatting = false;
 
   std::string DiagnosticDocumentationPath = "";