Merge pull request #38023 from al45tair/sr-14813

[SR-14813] [Fuzzers] Fix the mangler and reflection fuzzer build.

Author: al45tair

cmake/modules/AddSwift.cmake

@@ -935,7 +935,9 @@ function(add_swift_fuzzer_host_tool executable)
 
   # Then make sure that we pass the -fsanitize=fuzzer flag both on the cflags
   # and cxx flags line.
-  target_compile_options(${executable} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:"-fsanitize=fuzzer">)
+  target_compile_options(${executable} PRIVATE
+    $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-fsanitize=fuzzer>
+    $<$<COMPILE_LANGUAGE:Swift>:-sanitize=fuzzer>)
   target_link_libraries(${executable} PRIVATE "-fsanitize=fuzzer")
 endfunction()
 

tools/swift-reflection-fuzzer/swift-reflection-fuzzer.cpp

@@ -28,8 +28,9 @@
 #include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Object/MachOUniversal.h"
 #include "llvm/Support/CommandLine.h"
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
 
 #if defined(__APPLE__) && defined(__MACH__)
 #include <TargetConditionals.h>
@@ -73,6 +74,16 @@ class ObjectMemoryReader : public MemoryReader {
       *result = sizeof(void *);
       return true;
     }
+    case DLQ_GetPtrAuthMask: {
+      auto result = static_cast<uintptr_t *>(outBuffer);
+#if __has_feature(ptrauth_calls)
+      *result = static_cast<uintptr_t>(
+          ptrauth_strip(static_cast<void *>(0x0007ffffffffffff), 0));
+#else
+      *result = ~uintptr_t(0);
+#endif
+      return true;
+    }
     case DLQ_GetSizeSize: {
       auto result = static_cast<uint8_t *>(outBuffer);
       *result = sizeof(size_t);
@@ -131,6 +142,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   auto reader = std::make_shared<ObjectMemoryReader>();
   NativeReflectionContext context(std::move(reader));
   context.addImage(RemoteAddress(Data));
-  context.getBuilder().dumpAllSections(std::cout);
+  context.getBuilder().dumpAllSections(stdout);
   return 0; // Non-zero return values are reserved for future use.
 }