third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc - Issue 9667026: Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc

Issue 9667026: Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/tcmalloc/chromium/src/tests/current_allocated_bytes_test.cc ('k') | third_party/tcmalloc/chromium/src/tests/frag_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc

===================================================================

--- third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc (revision 126022)

+++ third_party/tcmalloc/chromium/src/tests/debugallocation_test.cc (working copy)

@@ -33,7 +33,7 @@

#include <stdio.h>

#include <stdlib.h>

#include <vector>

-#include "gperftools/malloc_extension.h"

+#include "google/malloc_extension.h"

#include "base/logging.h"

using std::vector;

@@ -75,10 +75,7 @@

// This flag won't be compiled in in opt mode.

DECLARE_int32(max_free_queue_size);

-// Test match as well as mismatch rules. But do not test on OS X; on

-// OS X the OS converts new/new[] to malloc before it gets to us, so

-// we are unable to catch these mismatch errors.

-#ifndef __APPLE__

+// Test match as well as mismatch rules:

TEST(DebugAllocationTest, DeallocMismatch) {

// malloc can be matched only by free

// new can be matched only by delete and delete(nothrow)

@@ -135,7 +132,6 @@

::operator delete[](y, std::nothrow);

}

-#endif // #ifdef OS_MACOSX

TEST(DebugAllocationTest, DoubleFree) {

int* pint = new int;