Merge remote-tracking branch 'origin/main' into rebranch

include/swift/Basic/LangOptions.h

@@ -230,14 +230,6 @@ namespace swift {
     /// Keep comments during lexing and attach them to declarations.
     bool AttachCommentsToDecls = false;
 
-    /// Whether to include initializers when code-completing a postfix
-    /// expression.
-    bool CodeCompleteInitsInPostfixExpr = false;
-
-    /// Whether to use heuristics to decide whether to show call-pattern
-    /// completions.
-    bool CodeCompleteCallPatternHeuristics = false;
-
     ///
     /// Flags for use by tests
     ///
@@ -595,6 +587,12 @@ namespace swift {
     /// than this many seconds.
     unsigned ExpressionTimeoutThreshold = 600;
 
+    /// If the shared pointer is not a \c nullptr and the pointee is \c true,
+    /// typechecking should be aborted at the next possible opportunity.
+    /// This is used by SourceKit to cancel requests for which the result is no
+    /// longer of interest.
+    std::shared_ptr<std::atomic<bool>> CancellationFlag = nullptr;
+
     /// If non-zero, abort the switch statement exhaustiveness checker if
     /// the Space::minus function is called more than this many times.
     ///
@@ -740,6 +738,9 @@ namespace swift {
     /// When set, don't look for or load overlays.
     bool DisableOverlayModules = false;
 
+    /// When set, import SPI_AVAILABLE symbols with Swift SPI attribtues.
+    bool EnableClangSPI = false;
+
     /// When set, don't enforce warnings with -Werror.
     bool DebuggerSupport = false;
 
@@ -767,8 +768,12 @@ namespace swift {
                           DetailedPreprocessingRecord,
                           ImportForwardDeclarations,
                           DisableSwiftBridgeAttr,
-                          DisableOverlayModules);
+                          DisableOverlayModules,
+                          EnableClangSPI);
     }
+
+    std::vector<std::string> getRemappedExtraArgs(
+        std::function<std::string(StringRef)> pathRemapCallback) const;
   };
 
 } // end namespace swift

include/swift/Basic/Statistics.def

@@ -268,6 +268,7 @@ FRONTEND_STATISTIC(Sema, NumUnloadedLazyIterableDeclContexts)
 #include "swift/AST/TypeCheckerTypeIDZone.def"
 #include "swift/Sema/IDETypeCheckingRequestIDZone.def"
 #include "swift/IDE/IDERequestIDZone.def"
+#include "swift/ClangImporter/ClangImporterTypeIDZone.def"
 #undef SWIFT_REQUEST
 
 #define SWIFT_REQUEST(ZONE, NAME, Sig, Caching, LocOptions) FRONTEND_STATISTIC(SILGen, NAME)

include/swift/Basic/TypeIDZones.def

@@ -1,37 +1,39 @@
 //===--- TypeIDZones.def - List of TypeID Zones -----------------*- C++ -*-===//
- //
- // This source file is part of the Swift.org open source project
- //
- // Copyright (c) 2014 - 2017 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 zones for TypeID.
- //
- //===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 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 zones for TypeID.
+//
+//===----------------------------------------------------------------------===//
 
- SWIFT_TYPEID_ZONE(C, 0)
- SWIFT_TYPEID_ZONE(AST, 1)
+SWIFT_TYPEID_ZONE(C, 0)
+SWIFT_TYPEID_ZONE(AST, 1)
 
- SWIFT_TYPEID_ZONE(Parse, 8)
- SWIFT_TYPEID_ZONE(NameLookup, 9)
+SWIFT_TYPEID_ZONE(Parse, 8)
+SWIFT_TYPEID_ZONE(NameLookup, 9)
 
- SWIFT_TYPEID_ZONE(TypeChecker, 10)
- SWIFT_TYPEID_ZONE(AccessControl, 11)
- SWIFT_TYPEID_ZONE(SILGen, 12)
- SWIFT_TYPEID_ZONE(SILOptimizer, 13)
- SWIFT_TYPEID_ZONE(TBDGen, 14)
+SWIFT_TYPEID_ZONE(TypeChecker, 10)
+SWIFT_TYPEID_ZONE(AccessControl, 11)
+SWIFT_TYPEID_ZONE(SILGen, 12)
+SWIFT_TYPEID_ZONE(SILOptimizer, 13)
+SWIFT_TYPEID_ZONE(TBDGen, 14)
 
- SWIFT_TYPEID_ZONE(IRGen, 20)
+SWIFT_TYPEID_ZONE(IRGen, 20)
 
- SWIFT_TYPEID_ZONE(IDETypeChecking, 97)
+SWIFT_TYPEID_ZONE(IDETypeChecking, 97)
 
- SWIFT_TYPEID_ZONE(IDETypes, 136)
- SWIFT_TYPEID_ZONE(IDE, 137)
+SWIFT_TYPEID_ZONE(IDETypes, 136)
+SWIFT_TYPEID_ZONE(IDE, 137)
 
- // N.B. This is not a formal zone and exists solely to support the unit tests.
- SWIFT_TYPEID_ZONE(ArithmeticEvaluator, 255)
+SWIFT_TYPEID_ZONE(ClangImporter, 139)
+
+// N.B. This is not a formal zone and exists solely to support the unit tests.
+SWIFT_TYPEID_ZONE(ArithmeticEvaluator, 255)