Merge pull request #2986 from swiftwasm/katei/merge-main-2021-04-15

Merge main 2021-04-15

Author: kateinoigakukun

docs/SIL.rst

@@ -1862,7 +1862,7 @@ derived from the ARC object. As an example, consider the following Swift/SIL::
   bb0(%0 : @guaranteed Klass):
     // Definition of '%1'
     %1 = copy_value %0 : $Klass
-    
+
     // Consume '%1'. This means '%1' can no longer be used after this point. We
     // rebind '%1' in the destination blocks (bbYes, bbNo).
     checked_cast_br %1 : $Klass to $OtherKlass, bbYes, bbNo
@@ -3319,6 +3319,24 @@ lowered by the SIL pipeline, so that IR generation only operands of type
 
 The operand is a guaranteed operand, i.e. not consumed.
 
+extract_executor
+````````````````
+
+::
+
+  sil-instruction ::= 'extract_executor' sil-operand
+
+  %1 = extract_executor %0 : $T
+  // $T must be Builtin.Executor or conform to the Actor protocol
+  // %1 will be of type Builtin.Executor
+
+Extracts the executor from the executor or actor operand. SIL generation
+emits this instruction to produce executor values when needed (e.g.,
+to provide to a runtime function). It will be lowered away by the SIL
+pipeline.
+
+The operand is a guaranteed operand, i.e. not consumed.
+
 dealloc_stack
 `````````````
 ::

include/swift/AST/DiagnosticsSema.def

@@ -704,7 +704,7 @@ ERROR(sema_no_import,Fatal,
       "no such module '%0'", (StringRef))
 ERROR(sema_no_import_target,Fatal,
       "could not find module '%0' for target '%1'; "
-      "found: %2", (StringRef, StringRef, StringRef))
+      "found: %2, at: %3", (StringRef, StringRef, StringRef, StringRef))
 ERROR(sema_no_import_repl,none,
       "no such module '%0'", (StringRef))
 NOTE(sema_no_import_no_sdk,none,

include/swift/AST/FileUnit.h

@@ -14,6 +14,8 @@
 #define SWIFT_AST_FILEUNIT_H
 
 #include "swift/AST/Module.h"
+#include "swift/AST/RawComment.h"
+#include "swift/Basic/BasicSourceInfo.h"
 
 namespace swift {
 static inline unsigned alignOfFileUnit();

include/swift/AST/Module.h

@@ -23,8 +23,8 @@
 #include "swift/AST/Identifier.h"
 #include "swift/AST/Import.h"
 #include "swift/AST/LookupKinds.h"
-#include "swift/AST/RawComment.h"
 #include "swift/AST/Type.h"
+#include "swift/Basic/BasicSourceInfo.h"
 #include "swift/Basic/Compiler.h"
 #include "swift/Basic/OptionSet.h"
 #include "swift/Basic/STLExtras.h"

include/swift/AST/NameLookup.h

@@ -25,6 +25,7 @@
 #include "swift/Basic/Debug.h"
 #include "swift/Basic/NullablePtr.h"
 #include "swift/Basic/SourceLoc.h"
+#include "swift/Basic/SourceManager.h"
 
 namespace swift {
 class ASTContext;

include/swift/AST/PrintOptions.h

@@ -510,6 +510,7 @@ struct PrintOptions {
     result.PrintDocumentationComments = true;
     result.PrintRegularClangComments = true;
     result.PrintLongAttrsOnSeparateLines = true;
+    result.AlwaysTryPrintParameterLabels = true;
     return result;
   }
 
@@ -655,6 +656,7 @@ struct PrintOptions {
     PO.ShouldQualifyNestedDeclarations = QualifyNestedDeclarations::TypesOnly;
     PO.PrintParameterSpecifiers = true;
     PO.SkipImplicit = true;
+    PO.AlwaysTryPrintParameterLabels = true;
     return PO;
   }
 };

include/swift/AST/RawComment.h

@@ -13,14 +13,14 @@
 #ifndef SWIFT_AST_RAW_COMMENT_H
 #define SWIFT_AST_RAW_COMMENT_H
 
-#include "swift/Basic/Fingerprint.h"
-#include "swift/Basic/LLVM.h"
 #include "swift/Basic/SourceLoc.h"
-#include "swift/Basic/SourceManager.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/StringRef.h"
 
 namespace swift {
 
 class SourceFile;
+class SourceManager;
 
 struct SingleRawComment {
   enum class CommentKind {
@@ -82,78 +82,6 @@ struct CommentInfo {
   uint32_t SourceOrder;
 };
 
-struct LineColumn {
-  uint32_t Line = 0;
-  uint32_t Column = 0;
-  bool isValid() const { return Line && Column; }
-};
-
-struct BasicDeclLocs {
-  StringRef SourceFilePath;
-  SmallVector<std::pair<LineColumn, uint32_t>, 4> DocRanges;
-  LineColumn Loc;
-  LineColumn StartLoc;
-  LineColumn EndLoc;
-};
-
-class BasicSourceFileInfo {
-  /// If this is non-null, fields other than 'FilePath' hasn't been populated.
-  /// The 'getInt()' part indicates this instance is constructed with a
-  /// SourceFile.
-  llvm::PointerIntPair<const SourceFile *, 1, bool> SFAndIsFromSF;
-
-  StringRef FilePath;
-  Fingerprint InterfaceHashIncludingTypeMembers = Fingerprint::ZERO();
-  /// Does *not* include the type-body hashes of the top level types.
-  /// Just the `SourceFile` hashes.
-  /// Used for incremental imports.
-  Fingerprint InterfaceHashExcludingTypeMembers = Fingerprint::ZERO();
-  llvm::sys::TimePoint<> LastModified = {};
-  uint64_t FileSize = 0;
-
-  // Populate the from 'SF' member if exist. 'SF' will be cleared.
-  void populateWithSourceFileIfNeeded();
-
-public:
-  BasicSourceFileInfo(StringRef FilePath,
-                      Fingerprint InterfaceHashIncludingTypeMembers,
-                      Fingerprint InterfaceHashExcludingTypeMembers,
-                      llvm::sys::TimePoint<> LastModified, uint64_t FileSize)
-      : FilePath(FilePath),
-        InterfaceHashIncludingTypeMembers(InterfaceHashIncludingTypeMembers),
-        InterfaceHashExcludingTypeMembers(InterfaceHashExcludingTypeMembers),
-        LastModified(LastModified), FileSize(FileSize) {}
-
-  ///  Construct with a `SourceFile`. `getInterfaceHashIncludingTypeMembers()`,
-  ///  `getInterfaceHashExcludingTypeMembers()`, `getLastModified()` and `getFileSize()` are laizily
-  ///  populated when accessed.
-  BasicSourceFileInfo(const SourceFile *SF);
-
-  bool isFromSourceFile() const;
-
-  StringRef getFilePath() const { return FilePath; }
-
-  Fingerprint getInterfaceHashIncludingTypeMembers() const {
-    const_cast<BasicSourceFileInfo *>(this)->populateWithSourceFileIfNeeded();
-    return InterfaceHashIncludingTypeMembers;
-  }
-
-  Fingerprint getInterfaceHashExcludingTypeMembers() const {
-    const_cast<BasicSourceFileInfo *>(this)->populateWithSourceFileIfNeeded();
-    return InterfaceHashExcludingTypeMembers;
-  }
-
-  llvm::sys::TimePoint<> getLastModified() const {
-    const_cast<BasicSourceFileInfo *>(this)->populateWithSourceFileIfNeeded();
-    return LastModified;
-  }
-
-  uint64_t getFileSize() const {
-    const_cast<BasicSourceFileInfo *>(this)->populateWithSourceFileIfNeeded();
-    return FileSize;
-  }
-};
-
 } // namespace swift
 
 #endif // LLVM_SWIFT_AST_RAW_COMMENT_H

include/swift/Basic/BasicSourceInfo.h

@@ -0,0 +1,100 @@
+//===--- BasicSourceInfo.h - Simple source information ----------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_BASIC_BASIC_SOURCE_INFO_H
+#define SWIFT_BASIC_BASIC_SOURCE_INFO_H
+
+#include "swift/Basic/Fingerprint.h"
+#include "swift/Basic/LLVM.h"
+#include "llvm/ADT/PointerIntPair.h"
+#include "llvm/Support/Chrono.h"
+
+namespace swift {
+
+class SourceFile;
+
+struct SourcePosition {
+  uint32_t Line = 0;
+  uint32_t Column = 0;
+  bool isValid() const { return Line && Column; }
+};
+
+struct BasicDeclLocs {
+  StringRef SourceFilePath;
+  SmallVector<std::pair<SourcePosition, uint32_t>, 4> DocRanges;
+  SourcePosition Loc;
+  SourcePosition StartLoc;
+  SourcePosition EndLoc;
+};
+
+class BasicSourceFileInfo {
+  /// If this is non-null, fields other than 'FilePath' hasn't been populated.
+  /// The 'getInt()' part indicates this instance is constructed with a
+  /// SourceFile.
+  llvm::PointerIntPair<const SourceFile *, 1, bool> SFAndIsFromSF;
+
+  StringRef FilePath;
+  Fingerprint InterfaceHashIncludingTypeMembers = Fingerprint::ZERO();
+  /// Does *not* include the type-body hashes of the top level types.
+  /// Just the `SourceFile` hashes.
+  /// Used for incremental imports.
+  Fingerprint InterfaceHashExcludingTypeMembers = Fingerprint::ZERO();
+  llvm::sys::TimePoint<> LastModified = {};
+  uint64_t FileSize = 0;
+
+  // Populate the from 'SF' member if exist. 'SF' will be cleared.
+  void populateWithSourceFileIfNeeded();
+
+public:
+  BasicSourceFileInfo(StringRef FilePath,
+                      Fingerprint InterfaceHashIncludingTypeMembers,
+                      Fingerprint InterfaceHashExcludingTypeMembers,
+                      llvm::sys::TimePoint<> LastModified, uint64_t FileSize)
+      : FilePath(FilePath),
+        InterfaceHashIncludingTypeMembers(InterfaceHashIncludingTypeMembers),
+        InterfaceHashExcludingTypeMembers(InterfaceHashExcludingTypeMembers),
+        LastModified(LastModified), FileSize(FileSize) {}
+
+  ///  Construct with a `SourceFile`. `getInterfaceHashIncludingTypeMembers()`,
+  ///  `getInterfaceHashExcludingTypeMembers()`, `getLastModified()` and
+  /// `getFileSize()` are laizily populated when accessed.
+  BasicSourceFileInfo(const SourceFile *SF);
+
+  bool isFromSourceFile() const;
+
+  StringRef getFilePath() const { return FilePath; }
+
+  Fingerprint getInterfaceHashIncludingTypeMembers() const {
+    const_cast<BasicSourceFileInfo *>(this)->populateWithSourceFileIfNeeded();
+    return InterfaceHashIncludingTypeMembers;
+  }
+
+  Fingerprint getInterfaceHashExcludingTypeMembers() const {
+    const_cast<BasicSourceFileInfo *>(this)->populateWithSourceFileIfNeeded();
+    return InterfaceHashExcludingTypeMembers;
+  }
+
+  llvm::sys::TimePoint<> getLastModified() const {
+    const_cast<BasicSourceFileInfo *>(this)->populateWithSourceFileIfNeeded();
+    return LastModified;
+  }
+
+  uint64_t getFileSize() const {
+    const_cast<BasicSourceFileInfo *>(this)->populateWithSourceFileIfNeeded();
+    return FileSize;
+  }
+};
+
+} // namespace swift
+
+#endif // SWIFT_BASIC_BASIC_SOURCE_INFO_H
+

include/swift/IDE/Utils.h

@@ -22,6 +22,7 @@
 #include "swift/IDE/SourceEntityWalker.h"
 #include "swift/Parse/Token.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/VirtualFileSystem.h"
 #include <memory>
 #include <string>
 #include <functional>

include/swift/Parse/Parser.h

@@ -1582,7 +1582,7 @@ class Parser {
   DeclNameRef parseDeclNameRef(DeclNameLoc &loc, const Diagnostic &diag,
                                DeclNameOptions flags);
 
-  Expr *parseExprIdentifier();
+  ParserResult<Expr> parseExprIdentifier();
   Expr *parseExprEditorPlaceholder(Token PlaceholderTok,
                                    Identifier PlaceholderId);