commit 13cc09cc1bd62c118dff6ddb447c4020c81509a8
author Vic Yang <victoryang@google.com> Tue Jun 11 17:05:52 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 11 17:05:52 2019 +0000
tree 8870a760db7fb13dfb5b97d9058f9dc1234c4bc3
parent b8dace7339b1ef6a5dcaa0384947a287a0f9cf20
parent 3ec16be2bc371b2ff689ec70cd801f35e21db052

Merge "linker: Speed up find_loaded_library_by_inode()"

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 7bc3529..9bb6557 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1222,12 +1222,14 @@
                                          off64_t file_offset,
                                          bool search_linked_namespaces,
                                          soinfo** candidate) {
+  if (file_stat.st_dev == 0 || file_stat.st_ino == 0) {
+    *candidate = nullptr;
+    return false;
+  }
 
   auto predicate = [&](soinfo* si) {
-    return si->get_st_dev() != 0 &&
-           si->get_st_ino() != 0 &&
+    return si->get_st_ino() == file_stat.st_ino &&
            si->get_st_dev() == file_stat.st_dev &&
-           si->get_st_ino() == file_stat.st_ino &&
            si->get_file_offset() == file_offset;
   };