Module Name:    src
Committed By:   christos
Date:           Tue Mar  5 22:35:45 UTC 2019

Modified Files:
        src/external/bsd/jemalloc/dist/include/jemalloc/internal: ph.h
        src/external/bsd/jemalloc/include/jemalloc/internal: ph.h

Log Message:
revert previous; not needed.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/jemalloc/include/jemalloc/internal/ph.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h
diff -u src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.3 src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.4
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.3	Tue Mar  5 10:18:59 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h	Tue Mar  5 17:35:45 2019
@@ -374,13 +374,11 @@ a_prefix##remove(a_ph_type *ph, a_type *
 				    parent);				\
 			}						\
 		} else {						\
-			a_type *prev = phn_prev_get(a_type, a_field, 	\
-			    phn);					\
-			if (prev != NULL) {				\
-				phn_next_set(a_type, a_field, prev,	\
-				    phn_next_get(a_type, a_field,	\
-				    phn));				\
-			}						\
+			assert(phn_prev_get(a_type, a_field, phn) !=	\
+			    NULL);					\
+			phn_next_set(a_type, a_field,			\
+			    phn_prev_get(a_type, a_field, phn),		\
+			    phn_next_get(a_type, a_field, phn));	\
 		}							\
 		if (phn_next_get(a_type, a_field, phn) != NULL) {	\
 			phn_prev_set(a_type, a_field,			\

Index: src/external/bsd/jemalloc/include/jemalloc/internal/ph.h
diff -u src/external/bsd/jemalloc/include/jemalloc/internal/ph.h:1.2 src/external/bsd/jemalloc/include/jemalloc/internal/ph.h:1.3
--- src/external/bsd/jemalloc/include/jemalloc/internal/ph.h:1.2	Tue Mar  5 10:18:59 2019
+++ src/external/bsd/jemalloc/include/jemalloc/internal/ph.h	Tue Mar  5 17:35:45 2019
@@ -374,13 +374,11 @@ a_prefix##remove(a_ph_type *ph, a_type *
 				    parent);				\
 			}						\
 		} else {						\
-			a_type *prev = phn_prev_get(a_type, a_field, 	\
-			    phn);					\
-			if (prev != NULL) {				\
-				phn_next_set(a_type, a_field, prev,	\
-				    phn_next_get(a_type, a_field,	\
-				    phn));				\
-			}						\
+			assert(phn_prev_get(a_type, a_field, phn) !=	\
+			    NULL);					\
+			phn_next_set(a_type, a_field,			\
+			    phn_prev_get(a_type, a_field, phn),		\
+			    phn_next_get(a_type, a_field, phn));	\
 		}							\
 		if (phn_next_get(a_type, a_field, phn) != NULL) {	\
 			phn_prev_set(a_type, a_field,			\

Reply via email to