Spelling driver (#42516)

* spelling: associated

Signed-off-by: Josh Soref <[email protected]>

* spelling: change

Signed-off-by: Josh Soref <[email protected]>

* spelling: declaration

Signed-off-by: Josh Soref <[email protected]>

* spelling: dependents

Signed-off-by: Josh Soref <[email protected]>

* spelling: deterministically

Signed-off-by: Josh Soref <[email protected]>

* spelling: embedded

Signed-off-by: Josh Soref <[email protected]>

* spelling: exclude

Signed-off-by: Josh Soref <[email protected]>

* spelling: filesystem

Signed-off-by: Josh Soref <[email protected]>

* spelling: given

Signed-off-by: Josh Soref <[email protected]>

* spelling: grained

Signed-off-by: Josh Soref <[email protected]>

* spelling: incrementality

Signed-off-by: Josh Soref <[email protected]>

* spelling: invoke

Signed-off-by: Josh Soref <[email protected]>

* spelling: locals

Signed-off-by: Josh Soref <[email protected]>

* spelling: preexisting

Signed-off-by: Josh Soref <[email protected]>

* spelling: should

Signed-off-by: Josh Soref <[email protected]>

* spelling: supplementary

Signed-off-by: Josh Soref <[email protected]>

* spelling: suppress

Signed-off-by: Josh Soref <[email protected]>

Co-authored-by: Josh Soref <[email protected]>

Author: jsoref

include/swift/Driver/FineGrainedDependencyDriverGraph.h

@@ -368,7 +368,7 @@ class ModuleDepGraph {
   /// Integrate the \p integrand, a node that represents a Decl in the swiftDeps
   /// file being integrated. \p preexistingNodeInPlace holds the node
   /// representing the same Decl that already exists, if there is one. \p
-  /// prexisintExpat holds a node with the same key that already exists, but was
+  /// preexistingExpat holds a node with the same key that already exists, but was
   /// not known to reside in any swiftDeps file. Return a bool indicating if
   /// this node represents a change that must be propagated, and the integrated
   /// ModuleDepGraphNode.
@@ -448,7 +448,7 @@ class ModuleDepGraph {
       std::vector<ModuleDepGraphNode *> &foundDependents,
       ModuleDepGraphNode *definition);
 
-  /// Givien a set of nodes, return the set of swiftDeps for the jobs those
+  /// Given a set of nodes, return the set of swiftDeps for the jobs those
   /// nodes are in.
   std::vector<std::string>
   computeSwiftDepsFromNodes(ArrayRef<const ModuleDepGraphNode *> nodes) const;

include/swift/Driver/Job.h

@@ -195,7 +195,7 @@ class CommandOutput {
   /// Assuming (and asserting) that there are one or more input pairs, associate
   /// an additional output named \p OutputFilename of type \p type with the
   /// first primary input. If the provided \p type is the primary output type,
-  /// overwrite the existing entry assocaited with the first primary input.
+  /// overwrite the existing entry associated with the first primary input.
   void setAdditionalOutputForType(file_types::ID type,
                                   StringRef OutputFilename);
 

lib/Driver/Compilation.cpp

@@ -902,7 +902,7 @@ namespace driver {
         }
 
         const Optional<std::pair<bool, bool>> shouldSchedAndIsCascading =
-            computeShouldInitiallyScheduleJobAndDependendents(cmd);
+            computeShouldInitiallyScheduleJobAndDependents(cmd);
         if (!shouldSchedAndIsCascading)
           return getEveryCompileJob(); // Load error, just run them all
         const bool &shouldSchedule = shouldSchedAndIsCascading->first;
@@ -934,7 +934,7 @@ namespace driver {
     /// the job is cascading. Or if there was a dependency-read error, return
     /// \c None to indicate don't-know.
     Optional<std::pair<bool, bool>>
-    computeShouldInitiallyScheduleJobAndDependendents(const Job *Cmd) {
+    computeShouldInitiallyScheduleJobAndDependents(const Job *Cmd) {
       auto CondAndHasDepsIfNoError =
           loadDependenciesAndComputeCondition(Cmd);
       if (!CondAndHasDepsIfNoError)
@@ -1148,7 +1148,7 @@ namespace driver {
 
     /// Create \c NumberOfParallelCommands batches and assign each job to a
     /// batch either filling each partition in order or, if seeded with a
-    /// nonzero value, pseudo-randomly (but determinstically and nearly-evenly).
+    /// nonzero value, pseudo-randomly (but deterministically and nearly-evenly).
     void partitionIntoBatches(std::vector<const Job *> Batchable,
                               BatchPartition &Partition) {
       if (Comp.getShowJobLifecycle()) {
@@ -1447,7 +1447,7 @@ namespace driver {
     /// \c loadDependenciesAndComputeCondition .
     /// Then, the cascading predicate is returned from
     /// \c isCompileJobInitiallyNeededForDependencyBasedIncrementalCompilation.
-    /// Then, in \c computeShouldInitiallyScheduleJobAndDependendents
+    /// Then, in \c computeShouldInitiallyScheduleJobAndDependents
     /// if the job needs a cascading build, it's dependents will be scheduled
     /// immediately. After the job finishes, it's dependencies will be processed
     /// again. If a non-cascading job failed, the driver will schedule all of
@@ -1705,8 +1705,8 @@ static void writeIndexUnitOutputPathsToFilelist(llvm::raw_fd_ostream &out,
   for (auto &output : outputInfo.getIndexUnitOutputFilenames())
     out << output << "\n";
 }
-static void writeSupplementarOutputToFilelist(llvm::raw_fd_ostream &out,
-                                              const Job *job) {
+static void writeSupplementaryOutputToFilelist(llvm::raw_fd_ostream &out,
+                                               const Job *job) {
   job->getOutput().writeOutputFileMap(out);
 }
 
@@ -1745,7 +1745,7 @@ static bool writeFilelistIfNecessary(const Job *job, const ArgList &args,
       writeIndexUnitOutputPathsToFilelist(out, job);
       break;
     case FilelistInfo::WhichFiles::SupplementaryOutput:
-      writeSupplementarOutputToFilelist(out, job);
+      writeSupplementaryOutputToFilelist(out, job);
       break;
     }
   }

lib/Driver/Driver.cpp

@@ -980,7 +980,7 @@ Driver::buildCompilation(const ToolChain &TC,
   computeArgsHash(ArgsHash, *TranslatedArgList);
   llvm::sys::TimePoint<> LastBuildTime = llvm::sys::TimePoint<>::min();
   InputInfoMap outOfDateMap;
-  std::string whyIgnoreIncrementallity =
+  std::string whyIgnoreIncrementality =
       !Incremental
           ? ""
           : buildRecordPath.empty()
@@ -1079,7 +1079,7 @@ Driver::buildCompilation(const ToolChain &TC,
   // Construct the graph of Actions.
   SmallVector<const Action *, 8> TopLevelActions;
   buildActions(TopLevelActions, TC, OI,
-               whyIgnoreIncrementallity.empty() ? &outOfDateMap : nullptr, *C);
+               whyIgnoreIncrementality.empty() ? &outOfDateMap : nullptr, *C);
 
   if (Diags.hadAnyError() && !AllowErrors)
     return nullptr;
@@ -1110,8 +1110,8 @@ Driver::buildCompilation(const ToolChain &TC,
 
   // This has to happen after building jobs, because otherwise we won't even
   // emit .swiftdeps files for the next build.
-  if (!whyIgnoreIncrementallity.empty())
-    C->disableIncrementalBuild(whyIgnoreIncrementallity);
+  if (!whyIgnoreIncrementality.empty())
+    C->disableIncrementalBuild(whyIgnoreIncrementality);
 
   if (Diags.hadAnyError() && !AllowErrors)
     return nullptr;
@@ -1816,7 +1816,7 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
 
   if (const Arg *A = Args.getLastArg(options::OPT_sanitize_recover_EQ)) {
     // Just validate the args. The frontend will parse these again and actually
-    // use them. To avoid emitting warnings multiple times we surpress warnings
+    // use them. To avoid emitting warnings multiple times we suppress warnings
     // here but not in the frontend.
     (void)parseSanitizerRecoverArgValues(A, OI.SelectedSanitizers, Diags,
                                          /*emitWarnings=*/false);

lib/Driver/ToolChains.cpp

@@ -318,7 +318,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
   // Pass through the values passed to -Xfrontend.
   inputArgs.AddAllArgValues(arguments, options::OPT_Xfrontend);
 
-  // Pass on module names whose symbols should be embeded in tbd.
+  // Pass on module names whose symbols should be embedded in tbd.
   inputArgs.AddAllArgs(arguments, options::OPT_embed_tbd_for_module);
 
   if (auto *A = inputArgs.getLastArg(options::OPT_working_directory)) {

lib/DriverTool/swift_api_digester_main.cpp

@@ -436,7 +436,7 @@ class SameNameNodeMatcher : public NodeMatcher {
   };
 
   // Get the priority for the favored name match kind. Favored name match kind
-  // locats before less favored ones.
+  // locals before less favored ones.
   ArrayRef<NameMatchKind> getNameMatchKindPriority(SDKNodeKind Kind) {
     if (Kind == SDKNodeKind::DeclFunction) {
       static NameMatchKind FuncPriority[] = { NameMatchKind::PrintedNameAndUSR,
@@ -1129,13 +1129,13 @@ class InterfaceTypeChangeDetector {
     bool HasOptional = L->getTypeKind() == KnownTypeKind::Optional &&
       R->getTypeKind() == KnownTypeKind::Optional;
     if (HasOptional) {
-      // Detect [String: Any]? to [StringRepresentableStruct: Any]? Chnage
+      // Detect [String: Any]? to [StringRepresentableStruct: Any]? Change
       KeyChangedTo =
         detectDictionaryKeyChangeInternal(L->getOnlyChild()->getAs<SDKNodeType>(),
                                           R->getOnlyChild()->getAs<SDKNodeType>(),
                                           Raw);
     } else {
-      // Detect [String: Any] to [StringRepresentableStruct: Any] Chnage
+      // Detect [String: Any] to [StringRepresentableStruct: Any] Change
       KeyChangedTo = detectDictionaryKeyChangeInternal(L, R, Raw);
     }
     if (!KeyChangedTo.empty()) {
@@ -1180,13 +1180,13 @@ class InterfaceTypeChangeDetector {
     bool HasOptional = L->getTypeKind() == KnownTypeKind::Optional &&
       R->getTypeKind() == KnownTypeKind::Optional;
     if (HasOptional) {
-      // Detect [String]? to [StringRepresentableStruct]? Chnage
+      // Detect [String]? to [StringRepresentableStruct]? Change
       KeyChangedTo =
         detectArrayMemberChangeInternal(L->getOnlyChild()->getAs<SDKNodeType>(),
                                         R->getOnlyChild()->getAs<SDKNodeType>(),
                                         Raw);
     } else {
-      // Detect [String] to [StringRepresentableStruct] Chnage
+      // Detect [String] to [StringRepresentableStruct] Change
       KeyChangedTo = detectArrayMemberChangeInternal(L, R, Raw);
     }
     if (!KeyChangedTo.empty()) {
@@ -1618,7 +1618,7 @@ void DiagnosisEmitter::handle(const SDKNodeDecl *Node, NodeAnnotation Anno) {
       }
     }
 
-    // If we can find a hoisted member for this removed delcaration, we
+    // If we can find a hoisted member for this removed declaration, we
     // emit the diagnostics as rename instead of removal.
     auto It = std::find_if(MemberChanges.begin(), MemberChanges.end(),
       [&](TypeMemberDiffItem &Item) { return Item.usr == Node->getUsr(); });
@@ -1642,7 +1642,7 @@ void DiagnosisEmitter::handle(const SDKNodeDecl *Node, NodeAnnotation Anno) {
       return;
     }
 
-    // We should exlude those declarations that are pulled up to the super classes.
+    // We should exclude those declarations that are pulled up to the super classes.
     bool FoundInSuperclass = false;
     if (auto PD = dyn_cast<SDKNodeDecl>(Node->getParent())) {
       if (PD->isAnnotatedAs(NodeAnnotation::Updated)) {
@@ -1847,10 +1847,10 @@ static bool readBreakageAllowlist(SDKContext &Ctx, llvm::StringSet<> &lines,
   if (BreakageAllowlistPath.empty())
     return 0;
   CompilerInstance instance;
-  CompilerInvocation invok;
-  invok.setModuleName("ForClangImporter");
+  CompilerInvocation invoke;
+  invoke.setModuleName("ForClangImporter");
   std::string InstanceSetupError;
-  if (instance.setup(invok, InstanceSetupError)) {
+  if (instance.setup(invoke, InstanceSetupError)) {
     return 1;
   }
   auto importer = ClangImporter::create(instance.getASTContext());
@@ -2055,19 +2055,19 @@ static int generateMigrationScript(StringRef LeftPath, StringRef RightPath,
   return 0;
 }
 
-static void setSDKPath(CompilerInvocation &InitInvok, bool IsBaseline,
+static void setSDKPath(CompilerInvocation &InitInvoke, bool IsBaseline,
                        StringRef SDK, StringRef BaselineSDK) {
   if (IsBaseline) {
     // Set baseline SDK
     if (!BaselineSDK.empty()) {
-      InitInvok.setSDKPath(BaselineSDK.str());
+      InitInvoke.setSDKPath(BaselineSDK.str());
     }
   } else {
     // Set current SDK
     if (!SDK.empty()) {
-      InitInvok.setSDKPath(SDK.str());
+      InitInvoke.setSDKPath(SDK.str());
     } else if (const char *SDKROOT = getenv("SDKROOT")) {
-      InitInvok.setSDKPath(SDKROOT);
+      InitInvoke.setSDKPath(SDKROOT);
     }
   }
 }
@@ -2185,7 +2185,7 @@ class SwiftAPIDigesterInvocation {
 private:
   std::string MainExecutablePath;
   std::unique_ptr<llvm::opt::OptTable> Table;
-  CompilerInvocation InitInvok;
+  CompilerInvocation InitInvoke;
   ActionType Action = ActionType::None;
   CheckerOptions CheckerOpts;
   llvm::StringSet<> IgnoredUsrs;
@@ -2379,29 +2379,29 @@ class SwiftAPIDigesterInvocation {
       return ComparisonInputMode::BaselineJson;
   }
 
-  int prepareForDump(CompilerInvocation &InitInvok, llvm::StringSet<> &Modules,
+  int prepareForDump(CompilerInvocation &InitInvoke, llvm::StringSet<> &Modules,
                      bool IsBaseline = false) {
-    InitInvok.setMainExecutablePath(MainExecutablePath);
-    InitInvok.setModuleName("swift_ide_test");
-    setSDKPath(InitInvok, IsBaseline, SDK, BaselineSDK);
+    InitInvoke.setMainExecutablePath(MainExecutablePath);
+    InitInvoke.setModuleName("swift_ide_test");
+    setSDKPath(InitInvoke, IsBaseline, SDK, BaselineSDK);
 
     if (!Triple.empty())
-      InitInvok.setTargetTriple(Triple);
+      InitInvoke.setTargetTriple(Triple);
 
     // Ensure the tool works on linux properly
-    InitInvok.getLangOptions().EnableObjCInterop =
-        InitInvok.getLangOptions().Target.isOSDarwin();
-    InitInvok.getClangImporterOptions().ModuleCachePath = ModuleCachePath;
+    InitInvoke.getLangOptions().EnableObjCInterop =
+        InitInvoke.getLangOptions().Target.isOSDarwin();
+    InitInvoke.getClangImporterOptions().ModuleCachePath = ModuleCachePath;
     // Module recovery issue shouldn't bring down the tool.
-    InitInvok.getLangOptions().AllowDeserializingImplementationOnly = true;
+    InitInvoke.getLangOptions().AllowDeserializingImplementationOnly = true;
 
     if (!SwiftVersion.empty()) {
       using version::Version;
       bool isValid = false;
       if (auto Version =
               Version::parseVersionString(SwiftVersion, SourceLoc(), nullptr)) {
         if (auto Effective = Version.getValue().getEffectiveLanguageVersion()) {
-          InitInvok.getLangOptions().EffectiveLanguageVersion = *Effective;
+          InitInvoke.getLangOptions().EffectiveLanguageVersion = *Effective;
           isValid = true;
         }
       }
@@ -2412,7 +2412,7 @@ class SwiftAPIDigesterInvocation {
     }
 
     if (!ResourceDir.empty()) {
-      InitInvok.setRuntimeResourcePath(ResourceDir);
+      InitInvoke.setRuntimeResourcePath(ResourceDir);
     }
     std::vector<SearchPathOptions::FrameworkSearchPath> FramePaths;
     for (const auto &path : CCSystemFrameworkPaths) {
@@ -2422,14 +2422,14 @@ class SwiftAPIDigesterInvocation {
       for (const auto &path : BaselineFrameworkPaths) {
         FramePaths.push_back({path, /*isSystem=*/false});
       }
-      InitInvok.setImportSearchPaths(BaselineModuleInputPaths);
+      InitInvoke.setImportSearchPaths(BaselineModuleInputPaths);
     } else {
       for (const auto &path : FrameworkPaths) {
         FramePaths.push_back({path, /*isSystem=*/false});
       }
-      InitInvok.setImportSearchPaths(ModuleInputPaths);
+      InitInvoke.setImportSearchPaths(ModuleInputPaths);
     }
-    InitInvok.setFrameworkSearchPaths(FramePaths);
+    InitInvoke.setFrameworkSearchPaths(FramePaths);
     if (!ModuleList.empty()) {
       if (readFileLineByLine(ModuleList, Modules))
         exit(1);
@@ -2438,7 +2438,7 @@ class SwiftAPIDigesterInvocation {
       Modules.insert(M);
     }
     for (auto M : PreferInterfaceForModules) {
-      InitInvok.getFrontendOptions().PreferInterfaceForModules.push_back(M);
+      InitInvoke.getFrontendOptions().PreferInterfaceForModules.push_back(M);
     }
     if (Modules.empty()) {
       llvm::errs() << "Need to specify -include-all or -module <name>\n";
@@ -2448,19 +2448,19 @@ class SwiftAPIDigesterInvocation {
   }
 
   SDKNodeRoot *getSDKRoot(SDKContext &Ctx, bool IsBaseline) {
-    CompilerInvocation Invok;
+    CompilerInvocation Invoke;
     llvm::StringSet<> Modules;
-    if (prepareForDump(Invok, Modules, IsBaseline))
+    if (prepareForDump(Invoke, Modules, IsBaseline))
       return nullptr;
-    return getSDKNodeRoot(Ctx, Invok, Modules);
+    return getSDKNodeRoot(Ctx, Invoke, Modules);
   }
 
   SDKNodeRoot *getBaselineFromJson(SDKContext &Ctx) {
     SwiftDeclCollector Collector(Ctx);
-    CompilerInvocation Invok;
+    CompilerInvocation Invoke;
     llvm::StringSet<> Modules;
     // We need to call prepareForDump to parse target triple.
-    if (prepareForDump(Invok, Modules, true))
+    if (prepareForDump(Invoke, Modules, true))
       return nullptr;
 
     assert(Modules.size() == 1 &&
@@ -2470,14 +2470,14 @@ class SwiftAPIDigesterInvocation {
     if (!BaselineFilePath.empty()) {
       Path = BaselineFilePath;
     } else if (!BaselineDirPath.empty()) {
-      Path = getCustomBaselinePath(Invok.getLangOptions().Target,
+      Path = getCustomBaselinePath(Invoke.getLangOptions().Target,
                                    Ctx.checkingABI(), BaselineDirPath);
     } else if (UseEmptyBaseline) {
       Path = getEmptyBaselinePath(MainExecutablePath);
     } else {
       Path = getDefaultBaselinePath(
           MainExecutablePath, Modules.begin()->getKey(),
-          Invok.getLangOptions().Target, Ctx.checkingABI());
+          Invoke.getLangOptions().Target, Ctx.checkingABI());
     }
     if (!fs::exists(Path)) {
       llvm::errs() << "Baseline at " << Path << " does not exist\n";
@@ -2494,11 +2494,11 @@ class SwiftAPIDigesterInvocation {
     switch (Action) {
     case ActionType::DumpSDK: {
       llvm::StringSet<> Modules;
-      return (prepareForDump(InitInvok, Modules))
+      return (prepareForDump(InitInvoke, Modules))
                  ? 1
-                 : dumpSDKContent(InitInvok, Modules,
+                 : dumpSDKContent(InitInvoke, Modules,
                                   getJsonOutputFilePath(
-                                      InitInvok.getLangOptions().Target,
+                                      InitInvoke.getLangOptions().Target,
                                       CheckerOpts.ABI, OutputFile, OutputDir),
                                   CheckerOpts);
     }

test/Driver/loaded_module_trace_directness_2.swift

@@ -32,7 +32,7 @@ public class MyNode {
 
 // 2. FilesystemKit - Nothing to do (pure Clang module).
 
-// 3. TestFilesystem - Check that CoreFilesystem and Filesytem can be imported.
+// 3. TestFilesystem - Check that CoreFilesystem and Filesystem can be imported.
 
 // RUN: %target-swift-frontend %s -typecheck -DTestFilesystem -DV1 -module-name TestFilesystemV1 -emit-loaded-module-trace-path %t/TestFilesystemV1.trace.json -I %t/include
 // RUN: %FileCheck %s --check-prefix=TESTFILESYSTEM < %t/TestFilesystemV1.trace.json

unittests/Driver/MockingFineGrainedDependencyGraphs.cpp

@@ -1,4 +1,4 @@
-//===--------------- MockingFineGraonedDependencyGraphs.cpp ---------------===//
+//===--------------- MockingFineGrainedDependencyGraphs.cpp ---------------===//
 //
 // This source file is part of the Swift.org open source project
 //

unittests/Driver/UnitTestSourceFileDepGraphFactory.h

@@ -62,7 +62,7 @@ class UnitTestSourceFileDepGraphFactory
 
   /// Return true if when the name appears in a unit test, it represents a
   /// context, not a baseName. Return false if a single name is a baseName,
-  /// without context Return None if there shoud be two names
+  /// without context Return None if there should be two names
   static Optional<bool> singleNameIsContext(NodeKind kind);
 
   static constexpr char nameContextSeparator = ',';