Commit 102b3bda authored by ulan@chromium.org's avatar ulan@chromium.org

Fix ASAN after r23404.

TBR=vogelheim@chromium.org

Review URL: https://codereview.chromium.org/501403002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23407 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 5becf4b2
...@@ -43,7 +43,6 @@ class GenericGraphVisit { ...@@ -43,7 +43,6 @@ class GenericGraphVisit {
typedef typename Traits::Node Node; typedef typename Traits::Node Node;
typedef typename Traits::Iterator Iterator; typedef typename Traits::Iterator Iterator;
typedef std::pair<Iterator, Iterator> NodeState; typedef std::pair<Iterator, Iterator> NodeState;
typedef zone_allocator<NodeState> ZoneNodeStateAllocator;
typedef std::stack<NodeState, ZoneDeque<NodeState>> NodeStateStack; typedef std::stack<NodeState, ZoneDeque<NodeState>> NodeStateStack;
NodeStateStack stack((ZoneDeque<NodeState>(zone))); NodeStateStack stack((ZoneDeque<NodeState>(zone)));
BoolVector visited(Traits::max_id(graph), false, zone); BoolVector visited(Traits::max_id(graph), false, zone);
......
...@@ -215,13 +215,20 @@ TEST(Regress3540) { ...@@ -215,13 +215,20 @@ TEST(Regress3540) {
CodeRange* code_range = new CodeRange(isolate); CodeRange* code_range = new CodeRange(isolate);
const size_t code_range_size = 4 * MB; const size_t code_range_size = 4 * MB;
if (!code_range->SetUp(code_range_size)) return; if (!code_range->SetUp(code_range_size)) return;
size_t allocated_size; Address address;
Address result; size_t size;
for (int i = 0; i < 5; i++) { address = code_range->AllocateRawMemory(code_range_size - MB,
result = code_range->AllocateRawMemory( code_range_size - MB, &size);
code_range_size - MB, code_range_size - MB, &allocated_size); CHECK(address != NULL);
CHECK((result != NULL) == (i == 0)); Address null_address;
} size_t null_size;
null_address = code_range->AllocateRawMemory(
code_range_size - MB, code_range_size - MB, &null_size);
CHECK(null_address == NULL);
code_range->FreeRawMemory(address, size);
delete code_range;
memory_allocator->TearDown();
delete memory_allocator;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment