This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[review] Clarify purpose of assert in _dl_lookup_symbol_x
- From: "Gabriel F. T. Gomes (Code Review)" <gerrit at gnutoolchain-gerrit dot osci dot io>
- To: Florian Weimer <fweimer at redhat dot com>, libc-alpha at sourceware dot org
- Date: Tue, 12 Nov 2019 07:47:09 -0500
- Subject: [review] Clarify purpose of assert in _dl_lookup_symbol_x
- Auto-submitted: auto-generated
- References: <gerrit.1572549639000.I3384349cef90cfd91862ebc34a4053f0c0a99404@gnutoolchain-gerrit.osci.io>
- Reply-to: gnutoolchain-gerrit at osci dot io
Gabriel F. T. Gomes has posted comments on this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/469
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Hi, Florian,
This cleanup looks good to me. Thanks.
Reviewed-by: Gabriel F. T. Gomes <gabrielftg@linux.ibm.com>
| --- elf/dl-lookup.c
| +++ elf/dl-lookup.c
| @@ -793,16 +793,14 @@ _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));
PS1, Line 797:
Checking for the incompatible flag makes more sense, imo, too.
|
| size_t i = 0;
| if (__glibc_unlikely (skip_map != NULL))
| /* Search the relevant loaded objects for a definition. */
| while ((*scope)->r_list[i] != skip_map)
| ++i;
|
| /* Search the relevant loaded objects for a definition. */
| for (size_t start = i; *scope != NULL; start = 0, ++scope)
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I3384349cef90cfd91862ebc34a4053f0c0a99404
Gerrit-Change-Number: 469
Gerrit-PatchSet: 1
Gerrit-Owner: Florian Weimer <fweimer@redhat.com>
Gerrit-Reviewer: Gabriel F. T. Gomes <gabriel@inconstante.net.br>
Gerrit-Comment-Date: Tue, 12 Nov 2019 12:47:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment