typecheck

Author: slavapestov

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -2137,7 +2137,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
       // Check redeclaration.
       (void)evaluateOrDefault(
-          Context.evaluator,
+          Ctx.evaluator,
           CheckRedeclarationRequest{
               VD, VD->getDeclContext()->getSelfNominalTypeDecl()},
           {});
@@ -2164,11 +2164,11 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       // expressions to mean something builtin to the language.  We *do* allow
       // these if they are escaped with backticks though.
       if (VD->getDeclContext()->isTypeContext() &&
-          (VD->getName().isSimpleName(Context.Id_Type) ||
-           VD->getName().isSimpleName(Context.Id_Protocol)) &&
+          (VD->getName().isSimpleName(Ctx.Id_Type) ||
+           VD->getName().isSimpleName(Ctx.Id_Protocol)) &&
           VD->getNameLoc().isValid() &&
-          Context.SourceMgr.extractText({VD->getNameLoc(), 1}) != "`") {
-        auto &DE = Context.Diags;
+          Ctx.SourceMgr.extractText({VD->getNameLoc(), 1}) != "`") {
+        auto &DE = Ctx.Diags;
         DE.diagnose(VD->getNameLoc(), diag::reserved_member_name,
                     VD, VD->getBaseIdentifier().str());
         DE.diagnose(VD->getNameLoc(), diag::backticks_to_escape)
@@ -2212,27 +2212,25 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       // target was loaded for the main module, where both belong to the same package;
       // this is an expected behavior, but it should have been loaded from the local
       // build directory, not from distributed SDK. In such case, we show a warning.
-      auto &diags = ID->Ctx.Diags;
-      diags.diagnose(ID,
-                     diag::in_package_module_not_compiled_locally,
-                     target->getBaseIdentifier(),
-                     target->getPackageName(),
-                     target->getModuleFilename());
+      Ctx.Diags.diagnose(ID,
+                         diag::in_package_module_not_compiled_locally,
+                         target->getBaseIdentifier(),
+                         target->getPackageName(),
+                         target->getModuleFilename());
     }
 
     // Report the public import of a private module.
-    if (ID->Ctx.LangOpts.LibraryLevel == LibraryLevel::API) {
+    if (Ctx.LangOpts.LibraryLevel == LibraryLevel::API) {
       auto importer = ID->getModuleContext();
       if (target &&
           !ID->getAttrs().hasAttribute<ImplementationOnlyAttr>() &&
           !ID->getAttrs().hasAttribute<SPIOnlyAttr>() &&
           ID->getAccessLevel() == AccessLevel::Public &&
           target->getLibraryLevel() == LibraryLevel::SPI) {
 
-        auto &diags = ID->Ctx.Diags;
         InFlightDiagnostic inFlight =
-            diags.diagnose(ID, diag::error_public_import_of_private_module,
-                           target->getName(), importer->getName());
+            Ctx.Diags.diagnose(ID, diag::error_public_import_of_private_module,
+                               target->getName(), importer->getName());
         if (ID->getAttrs().isEmpty()) {
            inFlight.fixItInsert(ID->getStartLoc(),
                               "@_implementationOnly ");
@@ -2500,7 +2498,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       if (Ctx.LangOpts.hasFeature(Feature::StaticExclusiveOnly) &&
           SD->getAttrs().hasAttribute<StaticExclusiveOnlyAttr>() &&
           !VD->isLet()) {
-        SD->Ctx.Diags.diagnoseWithNotes(
+        Ctx.Diags.diagnoseWithNotes(
           VD->diagnose(diag::attr_static_exclusive_only_let_only,
                        VD->getInterfaceType()),
           [&]() {