Changeset 78f0422c in mainline for uspace/lib/c/generic

Timestamp:

2023-10-22T17:27:09Z (2 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

133461c

Parents:

71b4444 (diff), dfb16c4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge C/C++ changes needed to build with newer GCC

Location:

uspace/lib/c/generic

Files:

• rtld/symbol.c (modified) (1 diff)
• thread/fibril_synch.c (modified) (1 diff)

uspace/lib/c/generic/rtld/symbol.c

@@ -135 +135 @@
         modules_untag(start->rtld);
 
-        /* Insert root (the program) into the queue and tag it */
+        /*
+         * Insert root (the program) into the queue and tag it.
+         *
+         * We disable the dangling-pointer warning because the compiler incorrectly
+         * assumes that we leak local address (queue) to a parent scope (to start
+         * argument). However, we always empty the list so the pointer cannot
+         * actually escape. Probably the compiler can never statically analyze that
+         * correctly.
+         */
         list_initialize(&queue);
         start->bfs_tag = true;
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && (__GNUC__ >= 12)
+#pragma GCC diagnostic ignored "-Wdangling-pointer"
+#endif
         list_append(&start->queue_link, &queue);
+#pragma GCC diagnostic pop
 
         /* If the symbol is found, it will be stored in 'sym' */

uspace/lib/c/generic/thread/fibril_synch.c

@@ -160 +160 @@
 {
         check_fibril_for_deadlock(oi, fibril_self());
-}
-
-void fibril_mutex_initialize(fibril_mutex_t *fm)
-{
-        fm->oi.owned_by = NULL;
-        fm->counter = 1;
-        list_initialize(&fm->waiters);
 }