aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-06-08 20:04:28 +0100
committerBen Murdoch <benm@google.com>2011-06-10 15:11:11 +0100
commitbea578b359de41272b0dded023b6e05ed2d579b6 (patch)
tree9347a44e935453488865193b1cacca95f5cae46a /src
parent46baaaf9a62c63bd863945d1758db3121ac8986f (diff)
downloadv8-bea578b359de41272b0dded023b6e05ed2d579b6.tar.gz
Merge V8 at r7668: Fix ENABLE_LOGGING_AND_PROFILING guards.
Partial cherry pick of http://code.google.com/p/v8/source/detail?r=8130 Change-Id: I28abe72ea9a12246f928b3e728a90af074718132
Diffstat (limited to 'src')
-rw-r--r--src/heap.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/heap.cc b/src/heap.cc
index 9a3cfe41..93bdc039 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -1517,6 +1517,7 @@ static void InitializeScavengingVisitorsTables() {
void Heap::SwitchScavengingVisitorsTableIfProfilingWasEnabled() {
+#ifdef ENABLE_LOGGING_AND_PROFILING
if (scavenging_visitors_table_mode_ == LOGGING_AND_PROFILING_ENABLED) {
// Table was already updated by some isolate.
return;
@@ -1542,6 +1543,7 @@ void Heap::SwitchScavengingVisitorsTableIfProfilingWasEnabled() {
Release_Store(&scavenging_visitors_table_mode_,
LOGGING_AND_PROFILING_ENABLED);
}
+#endif
}