Merge pull request #4692 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

SwiftCompilerSources/Sources/AST/DiagnosticEngine.swift

@@ -50,12 +50,12 @@ public struct DiagnosticFixIt {
     self.text = text
   }
 
-  func withBridgedDiagnosticFixIt(_ fn: (BridgedDiagnosticFixIt) -> Void) {
+  func withBridgedDiagnosticFixIt(_ fn: (swift.DiagnosticInfo.FixIt) -> Void) {
     text.withBridgedStringRef { bridgedTextRef in
-      let bridgedDiagnosticFixIt = BridgedDiagnosticFixIt(
-        start: start.bridged,
-        byteLength: byteLength,
-        text: bridgedTextRef)
+      let bridgedDiagnosticFixIt = swift.DiagnosticInfo.FixIt(
+        swift.CharSourceRange(start.bridged, UInt32(byteLength)),
+        llvm.StringRef(bridgedTextRef),
+        llvm.ArrayRef<swift.DiagnosticArgument>())
       fn(bridgedDiagnosticFixIt)
     }
   }
@@ -83,7 +83,7 @@ public struct DiagnosticEngine {
     let bridgedSourceLoc: swift.SourceLoc = position.bridged
     let bridgedHighlightRange: swift.CharSourceRange = highlight.bridged
     var bridgedArgs: [BridgedDiagnosticArgument] = []
-    var bridgedFixIts: [BridgedDiagnosticFixIt] = []
+    var bridgedFixIts: [swift.DiagnosticInfo.FixIt] = []
 
     // Build a higher-order function to wrap every 'withBridgedXXX { ... }'
     // calls, so we don't escape anything from the closure. 'bridgedArgs' and

SwiftCompilerSources/Sources/Basic/Utils.swift

@@ -48,6 +48,12 @@ extension BridgedStringRef {
   }
 }
 
+extension llvm.StringRef {
+  public init(_ bridged: BridgedStringRef) {
+    self.init(bridged.data, bridged.length)
+  }
+}
+
 extension String {
   public func withBridgedStringRef<T>(_ c: (BridgedStringRef) -> T) -> T {
     var str = self

SwiftCompilerSources/Sources/SIL/ApplySite.swift

@@ -21,8 +21,46 @@ public protocol ApplySite : Instruction {
   var operands: OperandArray { get }
   var numArguments: Int { get }
   var substitutionMap: SubstitutionMap { get }
+  
+  /// Converts an argument index of the apply to the corresponding argument index of the callee.
+  ///
+  /// For a FullApplySite this is always a 1-to-1 mapping.
+  /// For a `partial_apply` the callee index can be higher than the caller's argument index
+  /// because the arguments to `partial_apply` are a suffix of the callee.
+  ///
+  /// Example:
+  /// ```
+  /// func callee(a, b, c, d, e) { }
+  ///
+  /// %pa = partial_apply @callee(c, d, e)
+  /// // caller indices:          0, 1, 2
+  /// // callee indices:          2, 3, 4
+  ///
+  ///  %a = apply         %pa    (a, b)
+  /// // caller indices:          0, 1
+  /// // callee indices:          0, 1
+  /// ```
   func calleeArgIndex(callerArgIndex: Int) -> Int
+
+  /// Converts an argument index of a callee to the corresponding argument index of the apply.
+  ///
+  /// If the apply does not actually apply that argument, it returns nil.
+  /// Otherwise, for a FullApplySite this is always a 1-to-1 mapping.
+  /// For a `partial_apply` the caller index can be lower than the callee's argument index
+  /// because the arguments to `partial_apply` are a suffix of the callee.
+  ///
+  /// Example:
+  /// ```
+  ///                func callee(a, b, c, d, e) { }
+  /// // callee indices:         0, 1, 2, 3, 4
+  /// // caller indices in %pa:  -, -, 0, 1, 2     ("-" == nil)
+  /// // caller indices in %a:   0, 1, -, -, -
+  ///
+  /// %pa = partial_apply @callee(c, d, e)
+  ///  %a = apply         %pa    (a, b)
+  /// ```
   func callerArgIndex(calleeArgIndex: Int) -> Int?
+
   func getArgumentConvention(calleeArgIndex: Int) -> ArgumentConvention
 }
 
@@ -66,6 +104,15 @@ public protocol FullApplySite : ApplySite {
 }
 
 extension FullApplySite {
-  public func calleeArgIndex(callerArgIndex: Int) -> Int { callerArgIndex }
-  public func callerArgIndex(calleeArgIndex: Int) -> Int? { calleeArgIndex }
+  public func calleeArgIndex(callerArgIndex: Int) -> Int {
+    assert(callerArgIndex >= 0 && callerArgIndex < numArguments)
+    return callerArgIndex
+  }
+
+  public func callerArgIndex(calleeArgIndex: Int) -> Int? {
+    if calleeArgIndex < numArguments {
+      return calleeArgIndex
+    }
+    return nil
+  }
 }

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -514,7 +514,10 @@ final public class PartialApplyInst : SingleValueInstruction, ApplySite {
   public func callerArgIndex(calleeArgIndex: Int) -> Int? {
     let firstIdx = PartialApply_getCalleeArgIndexOfFirstAppliedArg(bridged)
     if calleeArgIndex >= firstIdx {
-      return calleeArgIndex - firstIdx
+      let callerIdx = calleeArgIndex - firstIdx
+      if callerIdx < numArguments {
+        return callerIdx
+      }
     }
     return nil
   }

include/swift/AST/ASTBridging.h

@@ -51,12 +51,6 @@ typedef struct {
   } value;
 } BridgedDiagnosticArgument;
 
-typedef struct {
-  swift::SourceLoc start;
-  SwiftInt byteLength;
-  BridgedStringRef text;
-} BridgedDiagnosticFixIt;
-
 typedef struct {
   void * _Nonnull object;
 } BridgedDiagnosticEngine;

include/swift/AST/DiagnosticsSema.def

@@ -2919,7 +2919,8 @@ ERROR(conformance_from_implementation_only_module,none,
       "in an extension with conditional conformances}2; "
       "%select{%3 has been imported as implementation-only|"
       "the conformance is declared as SPI in %3|"
-      "the conformance is declared as SPI}4",
+      "the conformance is declared as SPI|"
+      "%3 was not imported by this file}4",
       (Type, Identifier, unsigned, Identifier, unsigned))
 NOTE(assoc_conformance_from_implementation_only_module,none,
      "in associated type %0 (inferred as %1)", (Type, Type))

include/swift/Frontend/FrontendOptions.h

@@ -105,6 +105,9 @@ class FrontendOptions {
   /// If indexing system modules, don't index the stdlib.
   bool IndexIgnoreStdlib = false;
 
+  /// Include local definitions/references in the index data.
+  bool IndexIncludeLocals = false;
+
   /// The module for which we should verify all of the generic signatures.
   std::string VerifyGenericSignaturesInModule;
 

include/swift/IRGen/IRABIDetailsProvider.h

@@ -13,8 +13,10 @@
 #ifndef SWIFT_IRGEN_IRABIDETAILSPROVIDER_H
 #define SWIFT_IRGEN_IRABIDETAILSPROVIDER_H
 
+#include "swift/AST/Decl.h"
 #include "swift/AST/Type.h"
 #include "clang/AST/CharUnits.h"
+#include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
@@ -93,6 +95,10 @@ class IRABIDetailsProvider {
   /// access function.
   FunctionABISignature getTypeMetadataAccessFunctionSignature();
 
+  /// Returns EnumElementDecls (enum cases) in their declaration order with
+  /// their tag indices from the given EnumDecl
+  llvm::MapVector<EnumElementDecl *, unsigned> getEnumTagMapping(EnumDecl *ED);
+
 private:
   std::unique_ptr<IRABIDetailsProviderImpl> impl;
 };

include/swift/Index/IndexRecord.h

@@ -43,6 +43,9 @@ namespace index {
 /// \param skipStdlib If indexing system modules, don't index the standard
 /// library.
 ///
+/// \param includeLocals If true, emit index data for local definitions and
+/// references.
+///
 /// \param isDebugCompilation true for non-optimized compiler invocation.
 ///
 /// \param targetTriple The target for this compilation.
@@ -53,7 +56,8 @@ namespace index {
 bool indexAndRecord(SourceFile *primarySourceFile, StringRef indexUnitToken,
                     StringRef indexStorePath, bool indexClangModules,
                     bool indexSystemModules, bool skipStdlib,
-                    bool isDebugCompilation, StringRef targetTriple,
+                    bool includeLocals, bool isDebugCompilation,
+                    StringRef targetTriple,
                     const DependencyTracker &dependencyTracker,
                     const PathRemapper &pathRemapper);
 
@@ -81,6 +85,9 @@ bool indexAndRecord(SourceFile *primarySourceFile, StringRef indexUnitToken,
 /// \param skipStdlib If indexing system modules, don't index the standard
 /// library.
 ///
+/// \param includeLocals If true, emit index data for local definitions and
+/// references.
+///
 /// \param isDebugCompilation true for non-optimized compiler invocation.
 ///
 /// \param targetTriple The target for this compilation.
@@ -91,8 +98,8 @@ bool indexAndRecord(SourceFile *primarySourceFile, StringRef indexUnitToken,
 bool indexAndRecord(ModuleDecl *module, ArrayRef<std::string> indexUnitTokens,
                     StringRef moduleUnitToken, StringRef indexStorePath,
                     bool indexClangModules, bool indexSystemModules,
-                    bool skipStdlib, bool isDebugCompilation,
-                    StringRef targetTriple,
+                    bool skipStdlib, bool includeLocals,
+                    bool isDebugCompilation, StringRef targetTriple,
                     const DependencyTracker &dependencyTracker,
                     const PathRemapper &pathRemapper);
 // FIXME: indexUnitTokens could be StringRef, but that creates an impedance

include/swift/Option/Options.td

@@ -1262,6 +1262,10 @@ def index_ignore_clang_modules : Flag<["-"], "index-ignore-clang-modules">,
   Flags<[FrontendOption]>,
   HelpText<"Avoid indexing clang modules (pcms)">;
 
+def index_include_locals : Flag<["-"], "index-include-locals">,
+  Flags<[FrontendOption]>,
+  HelpText<"Include local definitions/references in the produced index data.">;
+
 def index_ignore_system_modules : Flag<["-"], "index-ignore-system-modules">,
   Flags<[NoInteractiveOption]>,
   HelpText<"Avoid indexing system modules">;

include/swift/SIL/SILArgument.h

@@ -68,6 +68,7 @@ class SILArgument : public ValueBase {
 
   SILBasicBlock *parentBlock;
   const ValueDecl *decl;
+  USE_SHARED_UINT8;
 
 protected:
   SILArgument(ValueKind subClassKind, SILBasicBlock *inputParentBlock,
@@ -81,19 +82,19 @@ class SILArgument : public ValueBase {
                        const ValueDecl *inputDecl = nullptr)
       : ValueBase(subClassKind, type),
         parentBlock(nullptr), decl(inputDecl) {
-    Bits.SILArgument.VOKind = static_cast<unsigned>(ownershipKind);
+    sharedUInt8().SILArgument.valueOwnershipKind = uint8_t(ownershipKind);
   }
 
 public:
   void operator=(const SILArgument &) = delete;
   void operator delete(void *, size_t) = delete;
 
   ValueOwnershipKind getOwnershipKind() const {
-    return static_cast<ValueOwnershipKind>(Bits.SILArgument.VOKind);
+    return ValueOwnershipKind(sharedUInt8().SILArgument.valueOwnershipKind);
   }
 
   void setOwnershipKind(ValueOwnershipKind newKind) {
-    Bits.SILArgument.VOKind = static_cast<unsigned>(newKind);
+    sharedUInt8().SILArgument.valueOwnershipKind = uint8_t(newKind);
   }
 
   SILBasicBlock *getParent() const { return parentBlock; }