Merge pull request #71336 from tshortli/warnings

NFC: Resolve some warnings

Author: tshortli

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -557,7 +557,7 @@ extension ASTGenVisitor {
       genericParamList: self.generate(genericParameterClause: node.genericParameterClause),
       parameterList: self.generate(functionParameterClause: node.signature.parameterClause, forSubscript: false),
       asyncSpecifierLoc: self.generateSourceLoc(node.signature.effectSpecifiers?.asyncSpecifier),
-      throwsSpecifierLoc: self.generateSourceLoc(node.signature.effectSpecifiers?.throwsSpecifier),
+      throwsSpecifierLoc: self.generateSourceLoc(node.signature.effectSpecifiers?.throwsClause?.throwsSpecifier),
       thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError),
       returnType: self.generate(type: node.signature.returnClause?.type),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
@@ -585,7 +585,7 @@ extension ASTGenVisitor {
       genericParamList: self.generate(genericParameterClause: node.genericParameterClause),
       parameterList: self.generate(functionParameterClause: node.signature.parameterClause, forSubscript: false),
       asyncSpecifierLoc: self.generateSourceLoc(node.signature.effectSpecifiers?.asyncSpecifier),
-      throwsSpecifierLoc: self.generateSourceLoc(node.signature.effectSpecifiers?.throwsSpecifier),
+      throwsSpecifierLoc: self.generateSourceLoc(node.signature.effectSpecifiers?.throwsClause?.throwsSpecifier),
       thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )

lib/ASTGen/Sources/ASTGen/Macros.swift

@@ -393,7 +393,7 @@ func makeExpansionOutputResult(
   expandedSource: String?,
   outputPointer: UnsafeMutablePointer<BridgedStringRef>
 ) -> Int {
-  guard var expandedSource = expandedSource else {
+  guard let expandedSource = expandedSource else {
     outputPointer.pointee = BridgedStringRef()
     return -1
   }
@@ -567,7 +567,7 @@ func expandFreestandingMacroInProcess(
     discriminator: discriminator
   )
 
-  let macroName = expansionSyntax.macro.text
+  let macroName = expansionSyntax.macroName.text
 
   // Make sure we emit all of the diagnostics from the context.
   defer {

lib/ASTGen/Sources/ASTGen/PluginHost.swift

@@ -31,7 +31,6 @@ public func _initializePlugin(
   cxxDiagnosticEngine: UnsafeMutableRawPointer?
 ) -> Bool {
   let plugin = CompilerPlugin(opaqueHandle: opaqueHandle)
-  let diagEngine = PluginDiagnosticsEngine(cxxDiagnosticEngine: cxxDiagnosticEngine)
 
   do {
     try plugin.initialize()
@@ -81,7 +80,7 @@ func swift_ASTGen_pluginServerLoadLibraryPlugin(
       assert(diagnostics.isEmpty)
       return true
     }
-    var errorMsgs = diagnostics.map({ $0.message }).joined(separator: ", ");
+    let errorMsgs = diagnostics.map({ $0.message }).joined(separator: ", ");
     errorOut?.pointee = allocateBridgedString(errorMsgs);
     return false
   } catch {

lib/ASTGen/Sources/ASTGen/Stmts.swift

@@ -446,7 +446,7 @@ extension ASTGenVisitor {
       switch node {
       case .switchCase(let node):
         return ASTNode.stmt(self.generate(switchCase: node).asStmt).bridged
-      case .ifConfigDecl(let node):
+      case .ifConfigDecl(_):
         fatalError("unimplemented")
       }
     }).bridgedArray(in: self)

lib/ASTGen/Sources/ASTGen/Types.swift

@@ -298,7 +298,7 @@ extension ASTGenVisitor {
         rightParenLoc: self.generateSourceLoc(node.rightParen)
       ).asTypeRepr,
       asyncLoc: self.generateSourceLoc(node.effectSpecifiers?.asyncSpecifier),
-      throwsLoc: self.generateSourceLoc(node.effectSpecifiers?.throwsSpecifier),
+      throwsLoc: self.generateSourceLoc(node.effectSpecifiers?.throwsClause?.throwsSpecifier),
       thrownType: self.generate(type: node.effectSpecifiers?.thrownError),
       arrowLoc: self.generateSourceLoc(node.returnClause.arrow),
       resultType: generate(type: node.returnClause.type)

lib/ClangImporter/ImportDecl.cpp

@@ -3381,13 +3381,6 @@ namespace {
                    d->getName() == "cos" || d->getName() == "exit";
           return false;
         };
-        auto topLevelModuleEq =
-            [](const clang::FunctionDecl *d, StringRef n) -> bool {
-          return d->getOwningModule() &&
-                 d->getOwningModule()
-                    ->getTopLevelModule()
-                    ->getFullModuleName() == n;
-        };
 
         if (clang::Module *owningModule = decl->getOwningModule();
             owningModule && importer::isCxxStdModule(owningModule)) {

lib/IRGen/LoadableByAddress.cpp

@@ -3494,12 +3494,15 @@ void AddressAssignment::finish(DominanceInfo *dominance,
   for (auto *inst : llvm::reverse(toDelete)) {
 #ifndef NDEBUG
     for (auto res : inst->getResults()) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code-loop-increment"
       for (auto *use : res->getUses()) {
         inst->dump();
         use->getUser()->dump();
         inst->getFunction()->dump();
         break;
       }
+#pragma clang diagnostic pop
     }
 #endif
     inst->eraseFromParent();

lib/SILOptimizer/Mandatory/MoveOnlyBorrowToDestructureUtils.cpp

@@ -1690,7 +1690,6 @@ bool BorrowToDestructureTransform::transform() {
   auto *fn = mmci->getFunction();
   LLVM_DEBUG(llvm::dbgs() << "Performing Borrow To Destructure Transform!\n";
              fn->print(llvm::dbgs()));
-  auto &C = fn->getASTContext();
   StackList<BeginBorrowInst *> borrowWorklist(mmci->getFunction());
 
   // If we failed to gather borrows due to the transform not understanding part