Commit 7f442da6 authored by Ulan Degenbaev's avatar Ulan Degenbaev Committed by Commit Bot

Fix Linux64_TSAN-concurrent_marking bot after 7a9e3ec9

The mock histogram functions cannot be cleared and can be called on
isolate tear down if incremental marking is in progress.

Bug: chromium:850508
Tbr: mlippautz@chromium.org
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I99e52aaa81c863f71e195aeed691b37da9e71da6
Reviewed-on: https://chromium-review.googlesource.com/1093073Reviewed-by: 's avatarUlan Degenbaev <ulan@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53616}
parent 65ba1cb6
...@@ -460,6 +460,7 @@ class GcHistogram { ...@@ -460,6 +460,7 @@ class GcHistogram {
} }
static void AddHistogramSample(void* histogram, int sample) { static void AddHistogramSample(void* histogram, int sample) {
if (histograms_.empty()) return;
static_cast<GcHistogram*>(histogram)->samples_.push_back(sample); static_cast<GcHistogram*>(histogram)->samples_.push_back(sample);
} }
...@@ -486,6 +487,7 @@ std::map<std::string, std::unique_ptr<GcHistogram>> GcHistogram::histograms_ = ...@@ -486,6 +487,7 @@ std::map<std::string, std::unique_ptr<GcHistogram>> GcHistogram::histograms_ =
std::map<std::string, std::unique_ptr<GcHistogram>>(); std::map<std::string, std::unique_ptr<GcHistogram>>();
TEST_F(GCTracerTest, RecordMarkCompactHistograms) { TEST_F(GCTracerTest, RecordMarkCompactHistograms) {
if (FLAG_stress_incremental_marking) return;
isolate()->SetCreateHistogramFunction(&GcHistogram::CreateHistogram); isolate()->SetCreateHistogramFunction(&GcHistogram::CreateHistogram);
isolate()->SetAddHistogramSampleFunction(&GcHistogram::AddHistogramSample); isolate()->SetAddHistogramSampleFunction(&GcHistogram::AddHistogramSample);
GCTracer* tracer = i_isolate()->heap()->tracer(); GCTracer* tracer = i_isolate()->heap()->tracer();
......
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