[Lldb-commits] [lldb] Fix ProcessElfCore::FindModuleUUID() so it work with symlinks. (PR #205235)

[via lldb-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff origin/main HEAD --extensions h,cpp -- lldb/include/lldb/Core/ModuleSpec.h lldb/include/lldb/Target/DynamicLoader.h lldb/include/lldb/Target/Process.h lldb/source/Core/DynamicLoader.cpp lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp lldb/source/Plugins/Process/elf-core/ProcessElfCore.h lldb/source/Target/Process.cpp --diff_from_common_commit
``````````

:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/lldb/include/lldb/Core/ModuleSpec.h b/lldb/include/lldb/Core/ModuleSpec.h
index 62ffa025f..f74641ef0 100644
--- a/lldb/include/lldb/Core/ModuleSpec.h
+++ b/lldb/include/lldb/Core/ModuleSpec.h
@@ -301,8 +301,7 @@ public:
       }
     }
     // Only match on load address if they both have a valid value.
-    if (m_load_addr.has_value() && 
-        match_module_spec.m_load_addr.has_value() &&
+    if (m_load_addr.has_value() && match_module_spec.m_load_addr.has_value() &&
         match_module_spec.GetLoadAddress() != GetLoadAddress())
       return false;
     return true;
diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h
index e105dbeb2..cdf0268ad 100644
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@@ -1425,7 +1425,7 @@ public:
   ///
   /// \param [in,out] spec
   ///     A module specification with as much detail as possible about the
-  ///     module for which we are trying to find a UUID. The 
+  ///     module for which we are trying to find a UUID. The
   ///     ModuleSpec.m_file should be filled in. If a dynamic loader is
   ///     calling this, the load address of the module can be filled in as
   ///     well. Sometimes the file path for a library can be a symlink and
diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
index 6cee49987..829335f38 100644
--- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
+++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
@@ -395,7 +395,7 @@ bool ProcessElfCore::FindModuleUUID(ModuleSpec &spec) {
     // best way for us to find a module is by load address, so use this trick
     // if the load address is set in the module specification.
     if (std::optional<lldb::addr_t> load_addr = spec.GetLoadAddress()) {
-      if (std::optional<NT_FILE_Entry> nt = 
+      if (std::optional<NT_FILE_Entry> nt =
               GetNTFileEntryContainingAddress(*load_addr))
         path = nt->path;
     }
@@ -408,9 +408,8 @@ bool ProcessElfCore::FindModuleUUID(ModuleSpec &spec) {
     if (it != m_uuids.end()) {
       Log *log = GetLog(LLDBLog::Process);
       spec.GetUUID() = it->second;
-      LLDB_LOGF(log, 
-                "ProcessElfCore::FindModuleUUID() found UUID for %s: %s",
-                spec.GetFileSpec().GetPath().c_str(), 
+      LLDB_LOGF(log, "ProcessElfCore::FindModuleUUID() found UUID for %s: %s",
+                spec.GetFileSpec().GetPath().c_str(),
                 it->second.GetAsString().c_str());
     }
   }

``````````

</details>


https://github.com/llvm/llvm-project/pull/205235