Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make(1): revert invalid assertion



details:   https://anonhg.NetBSD.org/src/rev/3843cae734cc
branches:  trunk
changeset: 942882:3843cae734cc
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Aug 21 14:33:32 2020 +0000

description:
make(1): revert invalid assertion

When iterating over a list, it is currently not guaranteed that the list
is marked as "!isOpen", which I had wrongly and naively assumed.

This probably means that there is some hidden bug in make, but even if
there is, this bug would be quite old already and was too small to be
detected.

Therefore, remove the assertion again, until the situation is clear and
reproduced.

diffstat:

 usr.bin/make/lst.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r d8251a06b661 -r 3843cae734cc usr.bin/make/lst.c
--- a/usr.bin/make/lst.c        Fri Aug 21 08:14:45 2020 +0000
+++ b/usr.bin/make/lst.c        Fri Aug 21 14:33:32 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.c,v 1.17 2020/08/21 07:04:31 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.18 2020/08/21 14:33:32 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -38,11 +38,11 @@
 #include "make_malloc.h"
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lst.c,v 1.17 2020/08/21 07:04:31 rillig Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.18 2020/08/21 14:33:32 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.17 2020/08/21 07:04:31 rillig Exp $");
+__RCSID("$NetBSD: lst.c,v 1.18 2020/08/21 14:33:32 rillig Exp $");
 #endif /* not lint */
 #endif
 
@@ -656,7 +656,6 @@
 Lst_OpenS(Lst list)
 {
     assert(LstValid(list));
-    assert(!list->isOpen);
 
     list->isOpen = TRUE;
     list->lastAccess = LstIsEmpty(list) ? Head : Unknown;



Home | Main Index | Thread Index | Old Index