Merge pull request #3868 from apple/lldb-fix-log-message-in-resolveRemoteAddress

[lldb] Fix log messages in resolveRemoteAddress

Author: kastiglione

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

@@ -185,7 +185,7 @@ bool LLDBMemoryReader::readBytes(swift::remote::RemoteAddress address,
   llvm::Optional<Address> maybeAddr =
       resolveRemoteAddress(address.getAddressData());
   if (!maybeAddr) {
-    LLDB_LOGV(log, "[MemoryReader] could not resolve address {1:x}",
+    LLDB_LOGV(log, "[MemoryReader] could not resolve address {0:x}",
               address.getAddressData());
     return false;
   }
@@ -230,13 +230,13 @@ bool LLDBMemoryReader::readString(swift::remote::RemoteAddress address,
                                   std::string &dest) {
   Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_TYPES));
 
-  LLDB_LOGV(log, "[MemoryReader] asked to read string data at address {0x}",
+  LLDB_LOGV(log, "[MemoryReader] asked to read string data at address {0:x}",
             address.getAddressData());
 
   llvm::Optional<Address> maybeAddr =
       resolveRemoteAddress(address.getAddressData());
   if (!maybeAddr) {
-    LLDB_LOGV(log, "[MemoryReader] could not resolve address {1:x}",
+    LLDB_LOGV(log, "[MemoryReader] could not resolve address {0:x}",
               address.getAddressData());
     return false;
   }
@@ -348,9 +348,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 {0:x} is larger than the upper bound "
+             "address of the mapped in modules",
+             address);
     return {};
   }
 
@@ -365,8 +365,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 {0:x} into "
+            "file address {1:x}",
             address, file_address);
   auto *object_file = module->GetObjectFile();
   if (!object_file)
@@ -375,16 +375,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 "
+             "{0:x} and object file {1}",
              file_address, object_file->GetFileSpec().GetFilename());
     return {};
   }
 
   LLDB_LOGV(log,
-            "[MemoryReader] Unsuccessfully resolved mapped address {1:x} "
-            "into file address {1:x}",
-            address, address);
+            "[MemoryReader] Successfully resolved mapped address {0:x} into "
+            "file address {1:x}",
+            address, resolved.GetFileAddress());
   return resolved;
 }