Module Name: src
Committed By: christos
Date: Tue Mar 5 15:18:59 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:
Check that the previous link exists before merging it.
XXX: Is that right? Fixing this makes the h_resolve test work.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h
cvs rdiff -u -r1.1 -r1.2 \
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.2 src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.3
--- src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h:1.2 Mon Mar 4 15:06:31 2019
+++ src/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h Tue Mar 5 10:18:59 2019
@@ -374,11 +374,13 @@ a_prefix##remove(a_ph_type *ph, a_type *
parent); \
} \
} else { \
- 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)); \
+ 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)); \
+ } \
} \
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.1 src/external/bsd/jemalloc/include/jemalloc/internal/ph.h:1.2
--- src/external/bsd/jemalloc/include/jemalloc/internal/ph.h:1.1 Mon Mar 4 12:25:09 2019
+++ src/external/bsd/jemalloc/include/jemalloc/internal/ph.h Tue Mar 5 10:18:59 2019
@@ -374,11 +374,13 @@ a_prefix##remove(a_ph_type *ph, a_type *
parent); \
} \
} else { \
- 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)); \
+ 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)); \
+ } \
} \
if (phn_next_get(a_type, a_field, phn) != NULL) { \
phn_prev_set(a_type, a_field, \
