Merge pull request #70943 from tshortli/resolve-more-warnings

tshortli · web-flow · commit 05dbd059e1b3 · 2024-01-16T17:19:51.000-08:00
Resolve more warnings
diff --git a/lib/Demangling/Errors.cpp b/lib/Demangling/Errors.cpp
@@ -102,7 +102,10 @@ static void reportNow(uint32_t flags, const char *message) {
   fflush(stderr);
 #endif
 #if SWIFT_STDLIB_HAS_ASL
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   asl_log(nullptr, nullptr, ASL_LEVEL_ERR, "%s", message);
+#pragma clang diagnostic pop
 #elif defined(__ANDROID__) && !defined(__TERMUX__)
   __android_log_print(ANDROID_LOG_FATAL, "SwiftDemangle", "%s", message);
 #endif
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
@@ -51,11 +51,11 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Host.h"
 #include "llvm/Support/MD5.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/TargetParser/Host.h"
 
 #include "CompilationRecord.h"
 
diff --git a/lib/Driver/FrontendUtil.cpp b/lib/Driver/FrontendUtil.cpp
@@ -21,8 +21,8 @@
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Host.h"
 #include "llvm/Support/StringSaver.h"
+#include "llvm/TargetParser/Host.h"
 
 using namespace swift;
 using namespace swift::driver;
diff --git a/lib/DriverTool/driver.cpp b/lib/DriverTool/driver.cpp
@@ -32,12 +32,11 @@
 #include "swift/FrontendTool/FrontendTool.h"
 #include "swift/DriverTool/DriverTool.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/TargetParser/Triple.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/Errno.h"
 #include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Host.h"
+#include "llvm/TargetParser/Host.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/PrettyStackTrace.h"
@@ -47,6 +46,8 @@
 #include "llvm/Support/StringSaver.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/TargetParser/Host.h"
+#include "llvm/TargetParser/Triple.h"
 
 #include <memory>
 #include <stdlib.h>
diff --git a/lib/DriverTool/swift_llvm_opt_main.cpp b/lib/DriverTool/swift_llvm_opt_main.cpp
@@ -56,7 +56,6 @@
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Host.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/PluginLoader.h"
 #include "llvm/Support/PrettyStackTrace.h"
@@ -66,6 +65,7 @@
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/ToolOutputFile.h"
 #include "llvm/Target/TargetMachine.h"
+#include "llvm/TargetParser/Host.h"
 #include "llvm/Transforms/Scalar/LoopPassManager.h"
 
 using namespace swift;
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -7928,7 +7928,6 @@ void Parser::parseExpandedMemberList(SmallVectorImpl<ASTNode> &items) {
   if (Tok.is(tok::NUM_TOKENS))
     consumeTokenWithoutFeedingReceiver();
 
-  auto *decl = CurDeclContext->getAsDecl();
   bool previousHadSemi = true;
 
   SourceLoc startingLoc = Tok.getLoc();
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
@@ -7629,7 +7629,6 @@ class SwiftToClangBasicReader :
     if (!rawKind)
       return nullptr;
 
-    clang::attr::Kind attrKind = static_cast<clang::attr::Kind>(rawKind - 1);
     auto name = readIdentifier();
     auto scopeName = readIdentifier();
 
diff --git a/stdlib/public/Concurrency/Actor.cpp b/stdlib/public/Concurrency/Actor.cpp
@@ -426,7 +426,10 @@ void swift::swift_task_reportUnexpectedExecutor(
   fflush(stderr);
 #endif
 #if SWIFT_STDLIB_HAS_ASL
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   asl_log(nullptr, nullptr, ASL_LEVEL_ERR, "%s", message);
+#pragma clang diagnostic pop
 #elif defined(__ANDROID__)
   __android_log_print(ANDROID_LOG_FATAL, "SwiftRuntime", "%s", message);
 #endif
diff --git a/stdlib/public/Concurrency/TaskGroup.cpp b/stdlib/public/Concurrency/TaskGroup.cpp
@@ -594,7 +594,10 @@ struct TaskGroupStatus {
     write(STDERR_FILENO, message, strlen(message));
 #endif
 #if defined(SWIFT_STDLIB_HAS_ASL)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     asl_log(nullptr, nullptr, ASL_LEVEL_ERR, "%s", message);
+#pragma clang diagnostic pop
 #elif defined(__ANDROID__)
     __android_log_print(ANDROID_LOG_FATAL, "SwiftRuntime", "%s", message);
 #endif
diff --git a/stdlib/public/Concurrency/TaskLocal.cpp b/stdlib/public/Concurrency/TaskLocal.cpp
@@ -294,7 +294,10 @@ static void swift_task_reportIllegalTaskLocalBindingWithinWithTaskGroupImpl(
   fflush(stderr);
 #endif
 #if SWIFT_STDLIB_HAS_ASL
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   asl_log(nullptr, nullptr, ASL_LEVEL_ERR, "%s", message);
+#pragma clang diagnostic pop
 #elif defined(__ANDROID__)
   __android_log_print(ANDROID_LOG_FATAL, "SwiftRuntime", "%s", message);
 #endif
diff --git a/stdlib/public/LLVMSupport/ErrorHandling.cpp b/stdlib/public/LLVMSupport/ErrorHandling.cpp
@@ -41,7 +41,10 @@ void error(const char *prefix, const char *msg, const char *file = nullptr, unsi
   }
 
 #if SWIFT_STDLIB_HAS_ASL
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   asl_log(nullptr, nullptr, ASL_LEVEL_ERR, "%s", buffer);
+#pragma clang diagnostic pop
 #elif defined(__ANDROID__) && !defined(__TERMUX__)
   __android_log_print(ANDROID_LOG_FATAL, "SwiftRuntime", "%s", buffer);
 #elif defined(_WIN32)
diff --git a/stdlib/public/SwiftShims/swift/shims/LibcOverlayShims.h b/stdlib/public/SwiftShims/swift/shims/LibcOverlayShims.h
@@ -59,7 +59,7 @@ static inline char * _Nullable * _Null_unspecified _swift_stdlib_getEnviron() {
   return environ;
 }
 #elif defined(__APPLE__)
-static inline char * _Nullable *_swift_stdlib_getEnviron() {
+static inline char * _Nullable * _Null_unspecified _swift_stdlib_getEnviron() {
   extern char * _Nullable **_NSGetEnviron(void);
   return *_NSGetEnviron();
 }
diff --git a/stdlib/public/runtime/Errors.cpp b/stdlib/public/runtime/Errors.cpp
@@ -313,7 +313,10 @@ reportNow(uint32_t flags, const char *message)
   fflush(stderr);
 #endif
 #if SWIFT_STDLIB_HAS_ASL
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   asl_log(nullptr, nullptr, ASL_LEVEL_ERR, "%s", message);
+#pragma clang diagnostic pop
 #elif defined(__ANDROID__)
   __android_log_print(ANDROID_LOG_FATAL, "SwiftRuntime", "%s", message);
 #endif
diff --git a/stdlib/public/runtime/SwiftObject.h b/stdlib/public/runtime/SwiftObject.h
@@ -35,6 +35,8 @@
 // Real class name: mangled "Swift._SwiftObject"
 #define SwiftObject _TtCs12_SwiftObject
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-root-class"
 #if __has_attribute(objc_root_class)
 __attribute__((__objc_root_class__))
 #endif
@@ -43,6 +45,7 @@ SWIFT_RUNTIME_EXPORT @interface SwiftObject<NSObject> {
   Class isa;
   SWIFT_HEAPOBJECT_NON_OBJC_MEMBERS;
 }
+#pragma clang diagnostic pop
 
 - (BOOL)isEqual:(id)object;
 - (NSUInteger)hash;
diff --git a/stdlib/public/runtime/SwiftObject.mm b/stdlib/public/runtime/SwiftObject.mm
@@ -1171,7 +1171,10 @@ static bool isObjCForUnownedReference(void *value) {
   if (object == nullptr)
     return nullptr;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreceiver-forward-class"
   if ([id_const_cast(object) isKindOfClass:[__SwiftValue class]]) {
+#pragma clang diagnostic pop
     // Source is a `__SwiftValue` container
     // Unwrap, then use the most general casting machine to do the heavy lifting
     auto typeValue = getValueFromSwiftValue(reinterpret_cast<__SwiftValue *>(object));
diff --git a/stdlib/tools/swift-reflection-test/swift-reflection-test.c b/stdlib/tools/swift-reflection-test/swift-reflection-test.c
@@ -187,7 +187,10 @@ static int PipeMemoryReader_queryDataLayout(void *Context,
 
 static void PipeMemoryReader_freeBytes(void *reader_context, const void *bytes,
                                        void *context) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-qual"
   free((void *)bytes);
+#pragma clang diagnostic pop
 }
 
 static
@@ -652,10 +655,13 @@ int reflectEnumValue(SwiftReflectionContextRef RC,
           void *outFreeContext = NULL;
           // !!! FIXME !!! obtain the pointer by properly projecting the enum value
           // Next lines are a hack to prove the concept.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-qual"
           const void *rawPtr
             = PipeMemoryReader_readBytes((void *)&Pipe, EnumInstance, 8, &outFreeContext);
           uintptr_t instance = *(uintptr_t *)rawPtr & 0xffffffffffffff8ULL;
           PipeMemoryReader_freeBytes((void *)&Pipe, rawPtr, outFreeContext);
+#pragma clang diagnostic pop
 
           // Indirect enum stores the payload as the first field of a closure context
           swift_typeinfo_t TI = swift_reflection_infoForInstance(RC, instance);
diff --git a/tools/SourceKit/lib/Support/Logging.cpp b/tools/SourceKit/lib/Support/Logging.cpp
@@ -66,6 +66,9 @@ Logger::~Logger() {
   fprintf(stderr, "%s: %s\n", LoggerName.c_str(), LogMsg.c_str());
 
 #if __APPLE__
+  // rdar://121076739
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   // Use the Apple System Log facility.
   aslclient asl = asl_open(LoggerName.c_str(), "com.apple.console",
                            ASL_OPT_NO_DELAY);
@@ -76,5 +79,6 @@ Logger::~Logger() {
   asl_send(asl, msg);
   asl_free(msg);
   asl_close(asl);
+#pragma clang diagnostic pop
 #endif
 }
diff --git a/unittests/AST/TestContext.h b/unittests/AST/TestContext.h
@@ -18,7 +18,7 @@
 #include "swift/Basic/SourceManager.h"
 #include "swift/SymbolGraphGen/SymbolGraphOptions.h"
 
-#include "llvm/Support/Host.h"
+#include "llvm/TargetParser/Host.h"
 
 namespace swift {
 namespace unittest {
diff --git a/unittests/DependencyScan/ModuleDeps.cpp b/unittests/DependencyScan/ModuleDeps.cpp
@@ -11,12 +11,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "ScanFixture.h"
-#include "swift/Basic/Platform.h"
 #include "swift/Basic/Defer.h"
-#include "llvm/TargetParser/Triple.h"
-#include "llvm/Support/Host.h"
+#include "swift/Basic/Platform.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/TargetParser/Host.h"
+#include "llvm/TargetParser/Triple.h"
 #include "gtest/gtest.h"
 #include <string>
 
