Merge pull request #1567 from swiftwasm/master

[pull] swiftwasm from master

Author: MaxDesiatov

docs/README.md

@@ -117,7 +117,7 @@ documentation, please create a thread on the Swift forums under the
     Provides an overview of the implementation of SIL in the compiler.
   - [OptimizerDesign.md](/docs/OptimizerDesign.md):
     Describes the design of the optimizer pipeline.
-  - [HighLevelSILOptimizations.rst](docs/HighLevelSILOptimizations.rst):
+  - [HighLevelSILOptimizations.rst](/docs/HighLevelSILOptimizations.rst):
     Describes how the optimizer understands the semantics of high-level
     operations on currency data types and optimizes accordingly.
     Includes a thorough discussion of the `@_semantics` attribute.

include/swift/AST/DiagnosticsSema.def

@@ -88,6 +88,13 @@ ERROR(could_not_find_subscript_member_did_you_mean,none,
       "did you mean to use the subscript operator?",
       (Type))
 
+ERROR(could_not_find_subscript_member_tuple, none,
+      "cannot access element using subscript for tuple type %0; "
+      "use '.' notation instead", (Type))
+ERROR(could_not_find_subscript_member_tuple_did_you_mean_use_dot, none,
+      "cannot access element using subscript for tuple type %0; "
+      "did you mean to use '.%1'?", (Type, StringRef))
+
 ERROR(could_not_find_enum_case,none,
       "enum type %0 has no case %1; did you mean %2?",
       (Type, DeclNameRef, DeclName))
@@ -2818,7 +2825,8 @@ NOTE(codable_extraneous_codingkey_case_here,none,
 NOTE(codable_non_conforming_property_here,none,
      "cannot automatically synthesize %0 because %1 does not conform to %0", (Type, TypeLoc))
 NOTE(codable_non_decoded_property_here,none,
-     "cannot automatically synthesize %0 because %1 does not have a matching CodingKey and does not have a default value", (Type, Identifier))
+     "cannot automatically synthesize %0 because %1 does not have a matching "
+     "CodingKey and does not have a default value", (Type, Identifier))
 NOTE(codable_codingkeys_type_is_not_an_enum_here,none,
      "cannot automatically synthesize %0 because 'CodingKeys' is not an enum", (Type))
 NOTE(codable_codingkeys_type_does_not_conform_here,none,

include/swift/AST/LocalizationFormat.h

@@ -18,6 +18,7 @@
 #define SWIFT_LOCALIZATIONFORMAT_H
 
 #include "llvm/ADT/Hashing.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Bitstream/BitstreamReader.h"
@@ -38,6 +39,7 @@ namespace swift {
 enum class DiagID : uint32_t;
 
 namespace diag {
+
 using namespace llvm::support;
 
 class LocalizationWriterInfo {
@@ -152,6 +154,8 @@ class YAMLLocalizationProducer final : public LocalizationProducer {
   std::vector<std::string> diagnostics;
 
 public:
+  /// The diagnostics IDs that are no longer available in `.def`
+  std::vector<std::string> unknownIDs;
   explicit YAMLLocalizationProducer(llvm::StringRef filePath);
   llvm::StringRef getMessageOr(swift::DiagID id,
                                llvm::StringRef defaultMessage) const override;
@@ -185,12 +189,23 @@ class LocalizationInput : public llvm::yaml::Input {
   template <typename T, typename Context>
   friend typename std::enable_if<llvm::yaml::has_SequenceTraits<T>::value,
                                  void>::type
-  readYAML(llvm::yaml::IO &io, T &Seq, bool, Context &Ctx);
+  readYAML(llvm::yaml::IO &io, T &Seq, T &unknownIDs, bool, Context &Ctx);
 
   template <typename T>
   friend typename std::enable_if<llvm::yaml::has_SequenceTraits<T>::value,
                                  LocalizationInput &>::type
   operator>>(LocalizationInput &yin, T &diagnostics);
+
+public:
+  /// A vector that keeps track of the diagnostics IDs that are available in
+  /// YAML and not available in `.def` files.
+  std::vector<std::string> unknownIDs;
+  
+  /// A diagnostic ID might be present in YAML and not in `.def` file, if that's
+  /// the case the `id` won't have a `DiagID` value.
+  /// If the `id` is available in `.def` file this method will return the `id`'s
+  /// value, otherwise this method won't return a value.
+  static llvm::Optional<uint32_t> readID(llvm::yaml::IO &io);
 };
 
 } // namespace diag

include/swift/AST/NameLookup.h

@@ -512,14 +512,6 @@ void recordLookupOfTopLevelName(DeclContext *topLevelContext, DeclName name,
 
 } // end namespace namelookup
 
-/// Retrieve the set of nominal type declarations that are directly
-/// referenced in the given \c typeRepr, looking through typealiases.
-/// 
-/// \param dc The \c DeclContext from which to perform lookup.
-TinyPtrVector<NominalTypeDecl *>
-getDirectlyReferencedNominalTypeDecls(ASTContext &ctx, TypeRepr *typeRepr,
-                                      DeclContext *dc, bool &anyObject);
-
 /// Retrieve the set of nominal type declarations that are directly
 /// "inherited" by the given declaration at a particular position in the
 /// list of "inherited" types.

include/swift/Basic/LangOptions.h

@@ -385,6 +385,12 @@ namespace swift {
     /// Load swiftmodule files in memory as volatile and avoid mmap.
     bool EnableVolatileModules = false;
 
+    /// Allow deserializing implementation only dependencies. This should only
+    /// be set true by lldb and other tooling, so that deserilization
+    /// recovery issues won't bring down the debugger.
+    /// TODO: remove this when @_implementationOnly modules are robust enough.
+    bool AllowDeserializingImplementationOnly = false;
+
     /// Sets the target we are building for and updates platform conditions
     /// to match.
     ///

lib/AST/LocalizationFormat.cpp

@@ -15,6 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/AST/LocalizationFormat.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Bitstream/BitstreamReader.h"
@@ -28,16 +29,13 @@
 #include <type_traits>
 
 namespace {
+
 enum LocalDiagID : uint32_t {
 #define DIAG(KIND, ID, Options, Text, Signature) ID,
 #include "swift/AST/DiagnosticsAll.def"
   NumDiags
 };
 
-struct DiagnosticNode {
-  uint32_t id;
-  std::string msg;
-};
 } // namespace
 
 namespace llvm {
@@ -55,15 +53,6 @@ template <> struct ScalarEnumerationTraits<LocalDiagID> {
   }
 };
 
-template <> struct MappingTraits<DiagnosticNode> {
-  static void mapping(IO &io, DiagnosticNode &node) {
-    LocalDiagID diagID;
-    io.mapRequired("id", diagID);
-    io.mapRequired("msg", node.msg);
-    node.id = static_cast<uint32_t>(diagID);
-  }
-};
-
 } // namespace yaml
 } // namespace llvm
 
@@ -121,6 +110,7 @@ YAMLLocalizationProducer::YAMLLocalizationProducer(llvm::StringRef filePath) {
   llvm::MemoryBuffer *document = FileBufOrErr->get();
   diag::LocalizationInput yin(document->getBuffer());
   yin >> diagnostics;
+  unknownIDs = std::move(yin.unknownIDs);
 }
 
 llvm::StringRef
@@ -143,31 +133,45 @@ void YAMLLocalizationProducer::forEachAvailable(
   }
 }
 
+llvm::Optional<uint32_t> LocalizationInput::readID(llvm::yaml::IO &io) {
+  LocalDiagID diagID;
+  io.mapRequired("id", diagID);
+  if (diagID == LocalDiagID::NumDiags)
+    return llvm::None;
+  return static_cast<uint32_t>(diagID);
+}
+
 template <typename T, typename Context>
 typename std::enable_if<llvm::yaml::has_SequenceTraits<T>::value, void>::type
-readYAML(llvm::yaml::IO &io, T &Seq, bool, Context &Ctx) {
+readYAML(llvm::yaml::IO &io, T &Seq, T &unknownIDs, bool, Context &Ctx) {
   unsigned count = io.beginSequence();
-  if (count)
+  if (count) {
     Seq.resize(LocalDiagID::NumDiags);
+  }
+
   for (unsigned i = 0; i < count; ++i) {
     void *SaveInfo;
     if (io.preflightElement(i, SaveInfo)) {
-      DiagnosticNode current;
-      yamlize(io, current, true, Ctx);
-      io.postflightElement(SaveInfo);
+      io.beginMapping();
 
-      // A diagnostic ID might be present in YAML and not in `.def` file,
-      // if that's the case ScalarEnumerationTraits will assign the diagnostic ID
-      // to `LocalDiagID::NumDiags`. Since the diagnostic ID isn't available
-      // in `.def` it shouldn't be stored in the diagnostics array.
-      if (current.id != LocalDiagID::NumDiags) {
+      // If the current diagnostic ID is available in YAML and in `.def`, add it
+      // to the diagnostics array. Otherwise, re-parse the current diagnnostic
+      // id as a string and store it in `unknownIDs` array.
+      if (auto id = LocalizationInput::readID(io)) {
         // YAML file isn't guaranteed to have diagnostics in order of their
         // declaration in `.def` files, to accommodate that we need to leave
         // holes in diagnostic array for diagnostics which haven't yet been
-        // localized and for the ones that have `DiagnosticNode::id`
-        // indicates their position.
-        Seq[static_cast<unsigned>(current.id)] = std::move(current.msg);
+        // localized and for the ones that have `id` indicates their position.
+        io.mapRequired("msg", Seq[*id]);
+      } else {
+        std::string unknownID, message;
+        // Read "raw" id since it doesn't exist in `.def` file.
+        io.mapRequired("id", unknownID);
+        io.mapRequired("msg", message);
+        unknownIDs.push_back(unknownID);
       }
+      io.endMapping();
+      io.postflightElement(SaveInfo);
     }
   }
   io.endSequence();
@@ -181,7 +185,7 @@ operator>>(LocalizationInput &yin, T &diagnostics) {
   if (yin.setCurrentDocument()) {
     // If YAML file's format doesn't match the current format in
     // DiagnosticMessageFormat, will throw an error.
-    readYAML(yin, diagnostics, true, Ctx);
+    readYAML(yin, diagnostics, yin.unknownIDs, true, Ctx);
   }
   return yin;
 }

lib/AST/NameLookup.cpp

@@ -861,13 +861,18 @@ SelfBounds SelfBoundsFromWhereClauseRequest::evaluate(
       continue;
 
     // Resolve the right-hand side.
-    if (auto *const typeRepr = req.getConstraintRepr()) {
-      const auto rhsNominals = getDirectlyReferencedNominalTypeDecls(
-          ctx, typeRepr, lookupDC, result.anyObject);
-
-      result.decls.insert(result.decls.end(), rhsNominals.begin(),
-                          rhsNominals.end());
+    DirectlyReferencedTypeDecls rhsDecls;
+    if (auto typeRepr = req.getConstraintRepr()) {
+      rhsDecls = directReferencesForTypeRepr(evaluator, ctx, typeRepr, lookupDC);
     }
+
+    SmallVector<ModuleDecl *, 2> modulesFound;
+    auto rhsNominals = resolveTypeDeclsToNominal(evaluator, ctx, rhsDecls,
+                                                 modulesFound,
+                                                 result.anyObject);
+    result.decls.insert(result.decls.end(),
+                        rhsNominals.begin(),
+                        rhsNominals.end());
   }
 
   return result;
@@ -2134,17 +2139,6 @@ static DirectlyReferencedTypeDecls directReferencesForType(Type type) {
   return { };
 }
 
-TinyPtrVector<NominalTypeDecl *> swift::getDirectlyReferencedNominalTypeDecls(
-    ASTContext &ctx, TypeRepr *typeRepr, DeclContext *dc, bool &anyObject) {
-  const auto referenced =
-      directReferencesForTypeRepr(ctx.evaluator, ctx, typeRepr, dc);
-
-  // Resolve those type declarations to nominal type declarations.
-  SmallVector<ModuleDecl *, 2> modulesFound;
-  return resolveTypeDeclsToNominal(ctx.evaluator, ctx, referenced, modulesFound,
-                                   anyObject);
-}
-
 DirectlyReferencedTypeDecls InheritedDeclsReferencedRequest::evaluate(
     Evaluator &evaluator,
     llvm::PointerUnion<const TypeDecl *, const ExtensionDecl *> decl,
@@ -2266,10 +2260,16 @@ ExtendedNominalRequest::evaluate(Evaluator &evaluator,
     // We must've seen 'extension { ... }' during parsing.
     return nullptr;
 
+  ASTContext &ctx = ext->getASTContext();
+  DirectlyReferencedTypeDecls referenced =
+    directReferencesForTypeRepr(evaluator, ctx, typeRepr, ext->getParent());
+
   // Resolve those type declarations to nominal type declarations.
+  SmallVector<ModuleDecl *, 2> modulesFound;
   bool anyObject = false;
-  const auto nominalTypes = getDirectlyReferencedNominalTypeDecls(
-      ext->getASTContext(), typeRepr, ext->getParent(), anyObject);
+  auto nominalTypes
+    = resolveTypeDeclsToNominal(evaluator, ctx, referenced, modulesFound,
+                                anyObject);
 
   // If there is more than 1 element, we will emit a warning or an error
   // elsewhere, so don't handle that case here.

lib/IDE/SourceEntityWalker.cpp

@@ -685,7 +685,7 @@ bool SemaAnnotator::
 passReference(ValueDecl *D, Type Ty, DeclNameLoc Loc, ReferenceMetaData Data) {
   SourceManager &SM = D->getASTContext().SourceMgr;
   SourceLoc BaseStart = Loc.getBaseNameLoc(), BaseEnd = BaseStart;
-  if (SM.extractText({BaseStart, 1}) == "`")
+  if (BaseStart.isValid() && SM.extractText({BaseStart, 1}) == "`")
     BaseEnd = Lexer::getLocForEndOfToken(SM, BaseStart.getAdvancedLoc(1));
   return passReference(D, Ty, BaseStart, {BaseStart, BaseEnd}, Data);
 }