Merge pull request #7301 from augusto2112/size-ptr-auth-mask-5.9

[lldb] Fix size of write when querying ptr auth mask

Author: adrian-prantl

lldb/source/Plugins/LanguageRuntime/Swift/LLDBMemoryReader.cpp

@@ -29,7 +29,7 @@ bool LLDBMemoryReader::queryDataLayout(DataLayoutQueryType type, void *inBuffer,
     // disk. Setting the bit in the mask ensures it isn't accidentally cleared
     // by ptrauth stripping.
     mask_pattern |= LLDB_FILE_ADDRESS_BIT;
-    memcpy(outBuffer, &mask_pattern, sizeof(uint64_t));
+    memcpy(outBuffer, &mask_pattern, m_process.GetAddressByteSize());
     return true;
   }
   case DLQ_GetObjCReservedLowBits: {

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

@@ -519,12 +519,13 @@ void SwiftLanguageRuntimeImpl::SetupReflection() {
       objc_interop ? "with Objective-C interopability" : "Swift only";
 
   auto &triple = exe_module->GetArchitecture().GetTriple();
-  if (triple.isArch64Bit()) {
+  auto byte_size = m_process.GetAddressByteSize();
+  if (byte_size == 8) {
     LLDB_LOGF(log, "Initializing a 64-bit reflection context (%s) for \"%s\"",
               triple.str().c_str(), objc_interop_msg);
     m_reflection_ctx = ReflectionContextInterface::CreateReflectionContext64(
         this->GetMemoryReader(), objc_interop, GetSwiftMetadataCache());
-  } else if (triple.isArch32Bit()) {
+  } else if (byte_size == 4) {
     LLDB_LOGF(log,
               "Initializing a 32-bit reflection context (%s) for \"%s\"",
               triple.str().c_str(), objc_interop_msg);