Changeset 3140 for trunk/src/kmk/alloccache.c

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• alloccache.c (modified) (3 diffs)

trunk/src/kmk/alloccache.c

@@ -38 +38 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include "make.h"
+#include "makeint.h"
 #include "dep.h"
 #include "debug.h"
@@ -67 +67 @@
   cache->free_head = f;
   MAKE_STATS(cache->free_count++;);
-#else
-  free(item);
-#endif
+#else  /* CONFIG_WITH_ALLOCCACHE_DEBUG */
+
+  struct alloccache **ppcache = (struct alloccache **)item - 1;
+  MY_ASSERT_MSG (*ppcache == cache, ("*ppcache=%p cache=%p item=%p\n", *ppcache, cache, item));
+  *ppcache = NULL;
+  free(ppcache);
+#endif /* CONFIG_WITH_ALLOCCACHE_DEBUG */
 }
 
@@ -99 +103 @@
   /* caller counts */
   return (struct alloccache_free_ent *)item;
-#else
-  return (struct alloccache_free_ent *)xmalloc(cache->size);
-#endif
+#else  /* CONFIG_WITH_ALLOCCACHE_DEBUG */
+
+  /* Prefix the allocation with a cache pointer so alloccahce_free can better
+     catch incorrect calls. */
+  struct alloccache **ppcache = (struct alloccache **)xmalloc(sizeof(*ppcache) + cache->size);
+  *ppcache = cache;
+  return (struct alloccache_free_ent *)(ppcache + 1);
+#endif /* CONFIG_WITH_ALLOCCACHE_DEBUG */
 }