From 25845db7c9fcc26a3478afd715a4fcd0798cb642 Mon Sep 17 00:00:00 2001
From: Jason Evans <jasone@canonware.com>
Date: Tue, 17 May 2016 10:36:17 -0700
Subject: [PATCH] Dodge ivsalloc() assertion in test code.

---
 test/unit/arena_reset.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/test/unit/arena_reset.c b/test/unit/arena_reset.c
index d7a02e0f..fa2c5cd5 100644
--- a/test/unit/arena_reset.c
+++ b/test/unit/arena_reset.c
@@ -78,6 +78,21 @@ get_huge_size(size_t ind)
 	return (get_size_impl("arenas.hchunk.0.size", ind));
 }
 
+/* Like ivsalloc(), but safe to call on discarded allocations. */
+static size_t
+vsalloc(tsdn_t *tsdn, const void *ptr)
+{
+	extent_t *extent;
+
+	extent = chunk_lookup(tsdn, ptr, false);
+	if (extent == NULL)
+		return (0);
+	if (!extent_active_get(extent))
+		return (0);
+
+	return (isalloc(tsdn, extent, ptr, false));
+}
+
 TEST_BEGIN(test_arena_reset)
 {
 #define	NHUGE	4
@@ -139,7 +154,7 @@ TEST_BEGIN(test_arena_reset)
 
 	/* Verify allocations no longer exist. */
 	for (i = 0; i < nptrs; i++) {
-		assert_zu_eq(ivsalloc(tsdn, ptrs[i], false), 0,
+		assert_zu_eq(vsalloc(tsdn, ptrs[i]), 0,
 		    "Allocation should no longer exist");
 	}