From bdae3615ca51b5aa8e7075396dc0c53748c78076 Mon Sep 17 00:00:00 2001
From: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Date: Sat, 22 Jul 2023 14:01:55 -0400
Subject: [PATCH] osx's dyld_present is always true

As reported to us by their compiler's warning.
---
 src/base/basictypes.h | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/base/basictypes.h b/src/base/basictypes.h
index 41cfd6e..eefe53b 100644
--- a/src/base/basictypes.h
+++ b/src/base/basictypes.h
@@ -313,32 +313,31 @@ class AssignAttributeStartEnd {
  public:
   AssignAttributeStartEnd(const char* name, char** pstart, char** pend) {
     // Find out what dynamic library name is defined in
-    if (_dyld_present()) {
-      for (int i = _dyld_image_count() - 1; i >= 0; --i) {
-        const mach_header* hdr = _dyld_get_image_header(i);
+    for (int i = _dyld_image_count() - 1; i >= 0; --i) {
+      const mach_header* hdr = _dyld_get_image_header(i);
 #ifdef MH_MAGIC_64
-        if (hdr->magic == MH_MAGIC_64) {
-          uint64_t len;
-          *pstart = getsectdatafromheader_64((mach_header_64*)hdr,
-                                             "__TEXT", name, &len);
-          if (*pstart) {   // NULL if not defined in this dynamic library
-            *pstart += _dyld_get_image_vmaddr_slide(i);   // correct for reloc
-            *pend = *pstart + len;
-            return;
-          }
+      if (hdr->magic == MH_MAGIC_64) {
+        uint64_t len;
+        *pstart = getsectdatafromheader_64((mach_header_64*)hdr,
+                                           "__TEXT", name, &len);
+        if (*pstart) {   // NULL if not defined in this dynamic library
+          *pstart += _dyld_get_image_vmaddr_slide(i);   // correct for reloc
+          *pend = *pstart + len;
+          return;
         }
+      }
 #endif
-        if (hdr->magic == MH_MAGIC) {
-          uint32_t len;
-          *pstart = getsectdatafromheader(hdr, "__TEXT", name, &len);
-          if (*pstart) {   // NULL if not defined in this dynamic library
-            *pstart += _dyld_get_image_vmaddr_slide(i);   // correct for reloc
-            *pend = *pstart + len;
-            return;
-          }
+      if (hdr->magic == MH_MAGIC) {
+        uint32_t len;
+        *pstart = getsectdatafromheader(hdr, "__TEXT", name, &len);
+        if (*pstart) {   // NULL if not defined in this dynamic library
+          *pstart += _dyld_get_image_vmaddr_slide(i);   // correct for reloc
+          *pend = *pstart + len;
+          return;
         }
       }
     }
+
     // If we get here, not defined in a dll at all.  See if defined statically.
     unsigned long len;    // don't ask me why this type isn't uint32_t too...
     *pstart = getsectdata("__TEXT", name, &len);