From 113eaa4daf6bada76c9d5b570f5a70fd086f82da Mon Sep 17 00:00:00 2001
From: David Major <dmajor@mozilla.com>
Date: Thu, 31 Oct 2013 11:52:08 -0400
Subject: [PATCH] Bug 931196 - Remove MOZ_TEMP_INVESTIGATION poisoning code.
 r=glandium

---
 memory/mozjemalloc/Makefile.in |  5 ++---
 memory/mozjemalloc/jemalloc.c  | 11 -----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/memory/mozjemalloc/Makefile.in b/memory/mozjemalloc/Makefile.in
index 4833c2b8a0d..fb734c3ba54 100644
--- a/memory/mozjemalloc/Makefile.in
+++ b/memory/mozjemalloc/Makefile.in
@@ -20,10 +20,9 @@ endif
 LOCAL_INCLUDES += -I$(topsrcdir)/memory/build
 
 # For non release/esr builds, enable (some) fatal jemalloc assertions.  This
-# helps us catch memory errors.  See bug 764192 for details on what
-# MOZ_TEMP_INVESTIGATION is for.
+# helps us catch memory errors.
 ifeq (,$(filter release esr,$(MOZ_UPDATE_CHANNEL)))
-DEFINES	+= -DMOZ_JEMALLOC_HARD_ASSERTS -DMOZ_TEMP_INVESTIGATION
+DEFINES	+= -DMOZ_JEMALLOC_HARD_ASSERTS
 endif
 
 DEFINES += -Dabort=moz_abort
diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
index 4af382bf5b1..e4b24fa67eb 100644
--- a/memory/mozjemalloc/jemalloc.c
+++ b/memory/mozjemalloc/jemalloc.c
@@ -4147,12 +4147,6 @@ arena_malloc_small(arena_t *arena, size_t size, bool zero)
 	} else
 		memset(ret, 0, size);
 
-#ifdef MOZ_TEMP_INVESTIGATION
-	if (size == 72) {
-		memset(ret, 0xe5, size);
-	}
-#endif
-
 	return (ret);
 }
 
@@ -4509,11 +4503,6 @@ arena_dalloc_small(arena_t *arena, arena_chunk_t *chunk, void *ptr,
 	if (opt_junk)
 		memset(ptr, 0x5a, size);
 #endif
-#ifdef MOZ_TEMP_INVESTIGATION
-	if (size == 72) {
-		memset(ptr, 0x75, size);
-	}
-#endif
 
 	arena_run_reg_dalloc(run, bin, ptr, size);
 	run->nfree++;