Merge pull request #59473 from medismailben/main

Fix swift/main bots

Author: shahmishal

include/swift/AST/ASTContext.h

@@ -224,7 +224,7 @@ class ASTContext final {
   void operator=(const ASTContext&) = delete;
 
   ASTContext(
-      LangOptions &langOpts, TypeCheckerOptions &typeckOpts,
+      LangOptions &langOpts, TypeCheckerOptions &typecheckOpts,
       SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
       ClangImporterOptions &ClangImporterOpts,
       symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
@@ -241,7 +241,7 @@ class ASTContext final {
   void operator delete(void *Data) throw();
 
   static ASTContext *
-  get(LangOptions &langOpts, TypeCheckerOptions &typeckOpts,
+  get(LangOptions &langOpts, TypeCheckerOptions &typecheckOpts,
       SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
       ClangImporterOptions &ClangImporterOpts,
       symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,

lib/AST/ASTContext.cpp

@@ -580,8 +580,9 @@ void ASTContext::operator delete(void *Data) throw() {
 }
 
 ASTContext *ASTContext::get(
-    LangOptions &langOpts, TypeCheckerOptions &typeckOpts, SILOptions &silOpts,
-    SearchPathOptions &SearchPathOpts, ClangImporterOptions &ClangImporterOpts,
+    LangOptions &langOpts, TypeCheckerOptions &typecheckOpts,
+    SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
+    ClangImporterOptions &ClangImporterOpts,
     symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
     SourceManager &SourceMgr, DiagnosticEngine &Diags,
     std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback) {
@@ -595,14 +596,15 @@ ASTContext *ASTContext::get(
   impl = reinterpret_cast<void *>(
       llvm::alignAddr(impl, llvm::Align(alignof(Implementation))));
   new (impl) Implementation();
-  return new (mem) ASTContext(langOpts, typeckOpts, silOpts, SearchPathOpts,
+  return new (mem) ASTContext(langOpts, typecheckOpts, silOpts, SearchPathOpts,
                               ClangImporterOpts, SymbolGraphOpts, SourceMgr,
                               Diags, PreModuleImportCallback);
 }
 
 ASTContext::ASTContext(
-    LangOptions &langOpts, TypeCheckerOptions &typeckOpts, SILOptions &silOpts,
-    SearchPathOptions &SearchPathOpts, ClangImporterOptions &ClangImporterOpts,
+    LangOptions &langOpts, TypeCheckerOptions &typecheckOpts,
+    SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
+    ClangImporterOptions &ClangImporterOpts,
     symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
     SourceManager &SourceMgr, DiagnosticEngine &Diags,
     std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback)