Merge pull request #1264 from swiftwasm/master

[pull] swiftwasm from master

Author: pull[bot]

docs/StandardLibraryProgrammersManual.md

@@ -98,7 +98,7 @@ On these platforms, the Swift Standard Library ships as an integrated part of th
 
 #### Unwrapping Optionals
 
-Optionals can be unwrapped with `!`, which triggers a trap on nil. Alternatively, they can be `.unsafelyUnwrapped()`, which will check and trap in debug builds of user code. Internal to the standard library is `._unsafelyUnwrappedUnchecked()` which will only check and trap in debug builds of the standard library itself. These correspond directly with `_precondition`, `_debugPrecondition`, and `_sanityCheck`. See [that section](#precondition) for details.
+Optionals can be unwrapped with `!`, which triggers a trap on nil. Alternatively, they can be `.unsafelyUnwrapped()`, which will check and trap in debug builds of user code. Internal to the standard library is `._unsafelyUnwrappedUnchecked()` which will only check and trap in debug builds of the standard library itself. These correspond directly with `_precondition`, `_debugPrecondition`, and `_internalInvariant`. See [that section](#precondition) for details.
 
 #### UnsafeBitCast and Casting References
 

include/swift/AST/CMakeLists.txt

@@ -58,11 +58,6 @@ namespace swift {
     DiagID ID;
   };
 
-  struct DiagnosticNode {
-    DiagID id;
-    std::string msg;
-  };
-
   namespace detail {
     /// Describes how to pass a diagnostic argument of the given type.
     ///
@@ -634,26 +629,7 @@ namespace swift {
     DiagnosticState(DiagnosticState &&) = default;
     DiagnosticState &operator=(DiagnosticState &&) = default;
   };
-
-  class LocalizationProducer {
-  public:
-    /// If the  message isn't available/localized in the current `yaml` file,
-    /// return the fallback default message.
-    virtual std::string getMessageOr(DiagID id,
-                                     std::string defaultMessage) const {
-      return defaultMessage;
-    }
-
-    virtual ~LocalizationProducer() {}
-  };
-
-  class YAMLLocalizationProducer final : public LocalizationProducer {
-  public:
-    std::vector<std::string> diagnostics;
-    explicit YAMLLocalizationProducer(std::string locale, std::string path);
-    std::string getMessageOr(DiagID id,
-                             std::string defaultMessage) const override;
-  };
+    
   /// Class responsible for formatting diagnostics and presenting them
   /// to the user.
   class DiagnosticEngine {
@@ -687,10 +663,6 @@ namespace swift {
     /// but rather stored until all transactions complete.
     llvm::StringSet<llvm::BumpPtrAllocator &> TransactionStrings;
 
-    /// Diagnostic producer to handle the logic behind retriving a localized
-    /// diagnostic message.
-    std::unique_ptr<LocalizationProducer> localization;
-
     /// The number of open diagnostic transactions. Diagnostics are only
     /// emitted once all transactions have closed.
     unsigned TransactionCount = 0;
@@ -762,11 +734,6 @@ namespace swift {
       return diagnosticDocumentationPath;
     }
 
-    void setLocalization(std::string locale, std::string path) {
-      if (!locale.empty() && !path.empty())
-        localization = std::make_unique<YAMLLocalizationProducer>(locale, path);
-    }
-
     void ignoreDiagnostic(DiagID id) {
       state.setDiagnosticBehavior(id, DiagnosticState::Behavior::Ignore);
     }
@@ -988,7 +955,8 @@ namespace swift {
     void emitTentativeDiagnostics();
 
   public:
-    const char *diagnosticStringFor(const DiagID id, bool printDiagnosticName);
+    static const char *diagnosticStringFor(const DiagID id,
+                                           bool printDiagnosticName);
 
     /// If there is no clear .dia file for a diagnostic, put it in the one
     /// corresponding to the SourceLoc given here.

include/swift/AST/DiagnosticEngine.h

@@ -287,9 +287,6 @@ class FrontendOptions {
   /// -dump-scope-maps.
   SmallVector<std::pair<unsigned, unsigned>, 2> DumpScopeMapLocations;
 
-  /// Indicates whether the action will immediately run code.
-  static bool isActionImmediate(ActionType);
-
   /// \return true if action only parses without doing other compilation steps.
   static bool shouldActionOnlyParse(ActionType);
 

include/swift/AST/DiagnosticMessageFormat.h

@@ -677,8 +677,10 @@ std::string ASTMangler::mangleAccessorEntityAsUSR(AccessorKind kind,
   llvm::SaveAndRestore<bool> allowUnnamedRAII(AllowNamelessEntities, true);
   Buffer << USRPrefix;
   appendAccessorEntity(getCodeForAccessorKind(kind), decl, isStatic);
-  // We have a custom prefix, so finalize() won't verify for us. Do it manually.
-  verify(Storage.str().drop_front(USRPrefix.size()));
+  // We have a custom prefix, so finalize() won't verify for us. If we're not
+  // in invalid code (coming from an IDE caller) verify manually.
+  if (!decl->isInvalid())
+    verify(Storage.str().drop_front(USRPrefix.size()));
   return finalize();
 }
 

include/swift/AST/Diagnostics/fr.yaml

@@ -20,7 +20,6 @@
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/DiagnosticSuppression.h"
-#include "swift/AST/DiagnosticMessageFormat.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/Pattern.h"
 #include "swift/AST/PrintOptions.h"
@@ -33,8 +32,6 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Format.h"
-#include "llvm/Support/YAMLParser.h"
-#include "llvm/Support/YAMLTraits.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace swift;
@@ -143,52 +140,6 @@ struct EducationalNotes {
 static constexpr EducationalNotes<LocalDiagID::NumDiags> _EducationalNotes = EducationalNotes<LocalDiagID::NumDiags>();
 static constexpr auto educationalNotes = _EducationalNotes.value;
 
-class LocalizationInput : public llvm::yaml::Input {
-  using Input::Input;
-
-  /// Read diagnostics in the YAML file iteratively
-  template <typename T, typename Context>
-  static typename std::enable_if<llvm::yaml::has_SequenceTraits<T>::value,
-                                 void>::type
-  readYAML(IO &io, T &Seq, bool, Context &Ctx) {
-    unsigned count = io.beginSequence();
-
-    // Resize Diags from YAML file to be the same size
-    // as diagnosticStrings from def files.
-    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);
-        // 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);
-      }
-    }
-    io.endSequence();
-  }
-
-  template <typename T>
-  inline friend
-      typename std::enable_if<llvm::yaml::has_SequenceTraits<T>::value,
-                              LocalizationInput &>::type
-      operator>>(LocalizationInput &yin, T &diagnostics) {
-    llvm::yaml::EmptyContext Ctx;
-    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);
-    }
-
-    return yin;
-  }
-};
-
 DiagnosticState::DiagnosticState() {
   // Initialize our per-diagnostic state to default
   perDiagnosticBehavior.resize(LocalDiagID::NumDiags, Behavior::Unspecified);
@@ -360,28 +311,6 @@ void Diagnostic::addChildNote(Diagnostic &&D) {
   ChildNotes.push_back(std::move(D));
 }
 
-YAMLLocalizationProducer::YAMLLocalizationProducer(std::string locale,
-                                                   std::string path) {
-  llvm::SmallString<128> DiagnosticsFilePath(path);
-  llvm::sys::path::append(DiagnosticsFilePath, locale);
-  llvm::sys::path::replace_extension(DiagnosticsFilePath, ".yaml");
-  auto FileBufOrErr = llvm::MemoryBuffer::getFileOrSTDIN(DiagnosticsFilePath);
-  if (!FileBufOrErr)
-    llvm_unreachable("Failed to read yaml file");
-  llvm::MemoryBuffer *document = FileBufOrErr->get();
-  LocalizationInput yin(document->getBuffer());
-  yin >> diagnostics;
-}
-
-std::string
-YAMLLocalizationProducer::getMessageOr(DiagID id,
-                                       std::string defaultMessage) const {
-  std::string diagnosticMessage = diagnostics[(unsigned)id];
-  if (diagnosticMessage.empty())
-    return defaultMessage;
-  return diagnosticMessage;
-}
-
 bool DiagnosticEngine::isDiagnosticPointsToFirstBadToken(DiagID ID) const {
   return storedDiagnosticInfos[(unsigned) ID].pointsToFirstBadToken;
 }
@@ -1082,17 +1011,10 @@ void DiagnosticEngine::emitDiagnostic(const Diagnostic &diagnostic) {
 
 const char *DiagnosticEngine::diagnosticStringFor(const DiagID id,
                                                   bool printDiagnosticName) {
-  // TODO: Print diagnostic names from `localization`.
   if (printDiagnosticName) {
     return debugDiagnosticStrings[(unsigned)id];
   }
-  auto defaultMessage = diagnosticStrings[(unsigned)id];
-  if (localization) {
-    std::string localizedMessage =
-        localization.get()->getMessageOr(id, defaultMessage);
-    return localizedMessage.c_str();
-  }
-  return defaultMessage;
+  return diagnosticStrings[(unsigned)id];
 }
 
 const char *InFlightDiagnostic::fixItStringFor(const FixItID id) {

include/swift/AST/diagnostics/en.yaml

@@ -2012,7 +2012,7 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
     body = body->getSemanticsProvidingExpr();
 
     if (auto *openExistential = dyn_cast<OpenExistentialExpr>(body)) {
-      body = openExistential->getSubExpr();
+      body = openExistential->getSubExpr()->getSemanticsProvidingExpr();
     }
 
     if (auto *outerCall = dyn_cast<ApplyExpr>(body)) {
@@ -2032,7 +2032,7 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
       innerBody = innerBody->getSemanticsProvidingExpr();
 
       if (auto *openExistential = dyn_cast<OpenExistentialExpr>(innerBody)) {
-        innerBody = openExistential->getSubExpr();
+        innerBody = openExistential->getSubExpr()->getSemanticsProvidingExpr();
         if (auto *ICE = dyn_cast<ImplicitConversionExpr>(innerBody))
           innerBody = ICE->getSyntacticSubExpr();
       }

include/swift/Frontend/FrontendOptions.h

@@ -539,7 +539,8 @@ bool ArgsToFrontendOptionsConverter::checkUnusedSupplementaryOutputPaths()
      return true;
    }
   if (!FrontendOptions::canActionEmitInterface(Opts.RequestedAction) &&
-      Opts.InputsAndOutputs.hasModuleInterfaceOutputPath()) {
+      (Opts.InputsAndOutputs.hasModuleInterfaceOutputPath() ||
+       Opts.InputsAndOutputs.hasPrivateModuleInterfaceOutputPath())) {
     Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_interface);
     return true;
   }

lib/AST/ASTMangler.cpp

@@ -67,45 +67,6 @@ bool FrontendOptions::needsProperModuleName(ActionType action) {
   llvm_unreachable("Unknown ActionType");
 }
 
-bool FrontendOptions::isActionImmediate(ActionType action) {
-  switch (action) {
-  case ActionType::NoneAction:
-  case ActionType::Parse:
-  case ActionType::ResolveImports:
-  case ActionType::Typecheck:
-  case ActionType::DumpParse:
-  case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
-  case ActionType::DumpInterfaceHash:
-  case ActionType::PrintAST:
-  case ActionType::DumpScopeMaps:
-  case ActionType::DumpTypeRefinementContexts:
-  case ActionType::EmitPCH:
-  case ActionType::EmitSILGen:
-  case ActionType::EmitSIL:
-  case ActionType::EmitSIBGen:
-  case ActionType::EmitSIB:
-  case ActionType::EmitModuleOnly:
-  case ActionType::MergeModules:
-  case ActionType::CompileModuleFromInterface:
-    return false;
-  case ActionType::Immediate:
-  case ActionType::REPL:
-    return true;
-  case ActionType::EmitAssembly:
-  case ActionType::EmitIR:
-  case ActionType::EmitBC:
-  case ActionType::EmitObject:
-  case ActionType::EmitImportedModules:
-  case ActionType::DumpTypeInfo:
-  case ActionType::EmitPCM:
-  case ActionType::DumpPCM:
-  case ActionType::ScanDependencies:
-    return false;
-  }
-  llvm_unreachable("Unknown ActionType");
-}
-
 bool FrontendOptions::shouldActionOnlyParse(ActionType action) {
   switch (action) {
   case FrontendOptions::ActionType::Parse: