More format string fixes

Author: kastiglione

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

@@ -302,9 +302,9 @@ LLDBMemoryReader::resolveRemoteAddress(uint64_t address) const {
   // If the address is larger than anything we have mapped the address is out
   if (pair_iterator == m_range_module_map.end()) {
     LLDB_LOG(log,
-              "[MemoryReader] Address {1:x} is larger than the upper bound "
-              "address of the mapped in modules",
-              address);
+             "[MemoryReader] Address {:x} is larger than the upper bound "
+             "address of the mapped in modules",
+             address);
     return {};
   }
 
@@ -319,8 +319,8 @@ LLDBMemoryReader::resolveRemoteAddress(uint64_t address) const {
     file_address = address - std::prev(pair_iterator)->first;
 
   LLDB_LOGV(log,
-            "[MemoryReader] Successfully resolved mapped address {1:x} "
-            "into file address {1:x}",
+            "[MemoryReader] Successfully resolved mapped address {:x} into "
+            "file address {:x}",
             address, file_address);
   auto *object_file = module->GetObjectFile();
   if (!object_file)
@@ -329,16 +329,16 @@ LLDBMemoryReader::resolveRemoteAddress(uint64_t address) const {
   Address resolved(file_address, object_file->GetSectionList());
   if (!resolved.IsValid()) {
     LLDB_LOG(log,
-             "[MemoryReader] Could not make a real address out of file "
-             "address {1:x} and object file {}",
+             "[MemoryReader] Could not make a real address out of file address "
+             "{:x} and object file {}",
              file_address, object_file->GetFileSpec().GetFilename());
     return {};
   }
 
   LLDB_LOGV(log,
-            "[MemoryReader] Successfully resolved mapped address {1:x} "
-            "into file address {1:x}",
-            address, resolved);
+            "[MemoryReader] Successfully resolved mapped address {:x} into "
+            "file address {:x}",
+            address, resolved.GetFileAddress());
   return resolved;
 }