]> sourceware.org Git - glibc.git/commitdiff
Clarify purpose of assert in _dl_lookup_symbol_x
authorFlorian Weimer <fweimer@redhat.com>
Thu, 31 Oct 2019 12:28:26 +0000 (13:28 +0100)
committerFlorian Weimer <fweimer@redhat.com>
Tue, 12 Nov 2019 19:11:04 +0000 (20:11 +0100)
Only one of the currently defined flags is incompatible with versioned
symbol lookups, so it makes sense to check for that flag and not its
complement.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Gabriel F. T. Gomes <gabrielftg@linux.ibm.com>
Change-Id: I3384349cef90cfd91862ebc34a4053f0c0a99404

elf/dl-lookup.c

index fd44cd41012d3ce8e6f7ff312c89d4006dfc495c..aaaf43799e6479284bdcb190827382894b0eab0b 100644 (file)
@@ -792,11 +792,9 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
 
   bump_num_relocations ();
 
-  /* No other flag than DL_LOOKUP_ADD_DEPENDENCY or DL_LOOKUP_GSCOPE_LOCK
-     is allowed if we look up a versioned symbol.  */
-  assert (version == NULL
-         || (flags & ~(DL_LOOKUP_ADD_DEPENDENCY | DL_LOOKUP_GSCOPE_LOCK))
-            == 0);
+  /* DL_LOOKUP_RETURN_NEWEST does not make sense for versioned
+     lookups.  */
+  assert (version == NULL || !(flags & DL_LOOKUP_RETURN_NEWEST));
 
   size_t i = 0;
   if (__glibc_unlikely (skip_map != NULL))
This page took 0.049497 seconds and 5 git commands to generate.