Changeset 3628 for trunk/src/kmk

Timestamp:

Oct 23, 2024, 1:34:56 AM (9 months ago)

Author:

bird

Message:

kmk/incdep.c: Fixed the list corruption when there are actually no dependency files to be added (they don't exist according to kFsCacheLookupWithLengthA).

File:

• trunk/src/kmk/incdep.c (modified) (5 diffs)

trunk/src/kmk/incdep.c

@@ -91 +91 @@
 #if defined(__gnu_linux__) || defined(__linux__)
 # define PARSE_IN_WORKER
+#endif
+
+
+/*******************************************************************************
+* Defined Constants And Macros                                                 *
+********************************************************************************/
+/* Custom assertion macro */
+#if (!defined(NDEBUG) || 0) && defined(_MSC_VER)
+# define MY_ASSERT(expr) do { \
+    if (!!(expr)) { /* likely */ } \
+    else { fprintf (stderr, "assertion failed on line %u in incdep.c: %s\n", __LINE__, #expr); __debugbreak(); } \
+  } while (0)
+# undef assert
+# define assert(expr)     MY_ASSERT(expr)
+#else
+# define MY_ASSERT(expr)  ((void)0)
 #endif
 
@@ -1429 +1445 @@
       if (ch != '\\' && ch != '$')
         {
-          if (!STOP_SET (ch, stop_mask))
+          if (!STOP_SET (ch, stop_mask)
+#ifdef HAVE_DOS_PATHS
+              || (    ch == ':'
+                   && (uintptr_t)src < (uintptr_t)end
+                   && (*src == '/' || *src == '\\')
+                   && (dst - start) == 1
+                   && isalpha ((unsigned char)*start))
+#endif
+             )
             *dst++ = ch;
           else
@@ -2127 +2151 @@
                     else
                       filename = incdep_unescape_and_cache_filename (curdep, (char *)fnnext, fnend, 0, &fnnext, NULL);
-                    if (filename != filename_prev) /* clang optimization. */
+                    if (filename != filename_prev) /* clang optimization, it emit two targets for each dependency list. */
                       incdep_record_file (curdep, filename, incdep_dup_dep_list (curdep, deps), f);
                   }
@@ -2235 +2259 @@
   unsigned int name_len;
 
+#if 0 /* sanity / debug */
+  {
+    struct incdep *check, *checktail;
+    unsigned items;
+    for (items = 0, check = checktail = incdep_head_todo; check; check = check->next)
+      checktail = check, items++;
+    MY_ASSERT (items == incdep_count_todo);
+    MY_ASSERT (checktail == incdep_tail_todo);
+  }
+#endif
+
   /* loop through NAMES, creating a todo list out of them. */
 
@@ -2300 +2335 @@
   else
     {
-      struct incdep *tmp;
-
-      /* initialize the worker threads and related stuff the first time around. */
-
-      if (!incdep_initialized)
-        incdep_init (f);
-
-      /* queue the files and notify the worker threads. */
-
-      incdep_lock ();
-
-      tmp = incdep_tail_todo;
-      if (tmp)
-        {
-          assert (incdep_count_todo > 0);
-          assert (incdep_head_todo != NULL);
-          tmp->next = head;
-        }
-      else
-        {
-          assert (incdep_count_todo == 0);
-          assert (incdep_head_todo == NULL);
-          incdep_head_todo = head;
-        }
-      incdep_tail_todo = tail;
-      incdep_count_todo += count;
-      thrd_data->todo_count += count;
-
-      incdep_signal_todo ();
-      incdep_unlock ();
-
-      /* flush the todo queue if we're requested to do so. */
-
-      if (op == incdep_flush)
-        incdep_flush_it (f);
+      if (head)
+        {
+          struct incdep *tmp;
+
+          /* initialize the worker threads and related stuff the first time around. */
+
+          if (!incdep_initialized)
+            incdep_init (f);
+
+          /* queue the files and notify the worker threads. */
+
+          incdep_lock ();
+
+          tmp = incdep_tail_todo;
+          if (tmp)
+            {
+              assert (incdep_count_todo > 0);
+              assert (incdep_head_todo != NULL);
+              tmp->next = head;
+            }
+          else
+            {
+              assert (incdep_count_todo == 0);
+              assert (incdep_head_todo == NULL);
+              incdep_head_todo = head;
+            }
+          incdep_tail_todo = tail;
+          incdep_count_todo += count;
+          thrd_data->todo_count += count;
+
+#if 0 /* sanity / debug */
+          {
+            struct incdep *check, *checktail;
+            unsigned items;
+            for (items = 0, check = checktail = incdep_head_todo; check; check = check->next)
+              checktail = check, items++;
+            MY_ASSERT (items == incdep_count_todo);
+            MY_ASSERT (checktail == incdep_tail_todo);
+          }
+#endif
+
+          incdep_signal_todo ();
+          incdep_unlock ();
+        }
+
+        /* flush the todo queue if we're requested to do so. */
+
+        if (op == incdep_flush)
+          incdep_flush_it (f);
     }
 }